More commenting
Merge remote-tracking branch 'master/master'

Conflicts:
	core/src/com/teamkarbon/android/test_gdx/derptest.java
Merge remote-tracking branch 'master/master'
Random whitespace reformation