Changes
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	FitnessUA/src/ua/nure/ostpc/malibu/shedule/Demo.java