Cloudtimer
SchedulerC
Merge branch 'master' of https://github.com/Karatekiwi/lsdc

Conflicts:
	src/at/ac/tuwien/lsdc/ss2013/entities/CloudTimer.java
	src/at/ac/tuwien/lsdc/ss2013/entities/SchedulerC.java