Android Manifest
Merge branch 'master' of https://github.com/chinesco/yhack2013

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/example/yhack2013/MainActivity$1.class
	bin/classes/com/example/yhack2013/MainActivity.class
Merge branch 'master' of https://github.com/chinesco/yhack2013
groupong by location
Merge branch 'master' of https://github.com/chinesco/yhack2013

Conflicts:
	src/com/example/yhack2013/MainActivity.java
Merge conflict
style