Full app final adjustments
Merge branch 'master' of https://github.com/havidarou/Pagoda.git

Conflicts:
	pagoda-android/AndroidManifest.xml