Fix buid.gradle and add makepretty task
Merge branch 'master' of https://github.com/TheTemportalist/Origin

Conflicts:
	build.gradle
Merge pull request #4 from dmodoomsirius/master

Fix buid.gradle and add makepretty task