New prealpha apk

This apk is in testing
Merge branch 'master' of https://github.com/indianpoptart/Parks-and-Recreation

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ParksAndRec.apk
	bin/resources.ap_