Some changes in scheduler
Merge branch 'master' of
https://github.com/BlockServerproject/BlockServer.git

Conflicts:
	src/java/org/blockserver/scheduler/Task.java