appfinal commit
test
Merge branch 'master' of https://github.com/syre/ToiletFinder

Conflicts:
	App/app/build/apk/app-debug-unaligned.apk
	App/app/build/classes/debug/com/example/toiletfinder/RESTHelper.class
	App/app/build/dex/debug/classes.dex
	App/app/src/main/java/com/example/toiletfinder/RESTHelper.java