Version++
Merge branch 'developing' into beta

Conflicts:
	AndroidManifest.xml
	res/raw/changelog.txt
Merge branch 'developing' into beta
Version++
Refactored Helpers
Started refactoring MainActivity
Refactoring, Cleanup and Fixed some warnings
Fixed some Lint warnings
Bugfix: getView is an android function
Merge commit '2b07ae1' into developing