Merge remote-tracking branch 'origin/dev'
Added logging in the ModBlocks file. Fixes #1.
Merge remote-tracking branch 'origin/dev'

Conflicts:
	src/main/java/com/minemaarten/advancedmod/init/ModBlocks.java
Merge remote-tracking branch 'origin/master' into dev