useless commit
Merge branch 'master' of https://github.com/Natio/Places

Conflicts:
	app/src/main/java/com/gcw/sapienza/places/PlacesApplication.java