Just a progress dump
Merge branch 'develop'

Conflicts:
	build.gradle
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/Dakror/Burst.git
fixed android stuff?
derp³
Merge branch 'master' into develop