Adding fixes to warstats and view
Merge branch 'master' of http://github.com/rhefew/inception

Conflicts:
	app/app-release.apk
	app/build.gradle