Hold ja resume napit
Merge branch 'master' of https://github.com/sampoz/sdp12

Conflicts:
	Titanium-UI/src/datalogic/SchedulingDataManager.java
Manuaalista resolvea