Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git

Conflicts:
	src/plat/interfaces/BlockInterface.java
Merge branch 'master' of https://github.com/Others/CodeDayPlatform.git