version 2.3
Merge branch 'master' of https://github.com/timbillstrom/Aina-Android

Conflicts:
	AndroidManifest.xml