zzz
Merge remote-tracking branch 'origin/development' into development
project properties
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	MouseTelemetry/MouseTelemetry-cms/nbproject/project.properties
	MouseTelemetry/MouseTelemetry-dataprocessing/nbproject/project.properties
	MouseTelemetry/MouseTelemetry-war/nbproject/project.properties
	MouseTelemetry/MouseTelemetry-war/src/java/cz/hbbt/mousetelemetry/view/bean/GraphToolboxMB.java
	MouseTelemetry/nbproject/project.properties
header brand link fix