merge
Merge branch 'master' of github.com:baardev/hoy

Conflicts:
	AndroidManifest.xml
added util to make custom apks.  see MAKE00