CSS changed
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	FitnessUA/war/css/scheduleManager.css