Merge branch 'master' into measuring

 Conflicts:
	conf.py
	scripts/configurations.py

diff --cc conf.py
index 31f343af90caad981bdb98a45992b15279f73f30,965d2f4d87f657076cc3307f1dea9ead6b2fd154..fd905b0fec43fcbfa89c94079d767bc8885ea826
--- 1/conf.py
--- 2/conf.py
+++ b/conf.py
@@@ -29,12 -29,12 +29,16 @@@ boot_command = ['./boot_script'
  
  # parse_command
  # Command to parse double value from boot output
 -parse_command = ['echo', '0']
 +parse_command = ['./parse_script']
 +
 +# measurement_identifier
 +# Identifier of measurement can consist of measure tool name and version
 +measure_identifier = 'cyclictest-v0.92'
  
+ # measurement_identifier
+ # Identifier of measurement can consist of measure tool name and version
+ measure_identifier = 'cyclictest-v0.92'
+ 
  # picosat_args
  # Additional arguments passed to PicoSAT.
  picosat_args = []