commented out maps
hunt images
custom merge
Merge branch 'dev'

Conflicts:
	ChaseIt/src/com/chaseit/models/HuntImage.java
Merge branch 'master' of https://github.com/sgattani/Group-Project
Merge branch 'master' of https://github.com/sgattani/Group-Project

Conflicts:
	ChaseIt/project.properties
Merge branch 'master' of https://github.com/sgattani/Group-Project

Conflicts:
	ChaseIt/project.properties
	ChaseIt/src/com/chaseit/ParseHelper.java
	google-play-services_lib/project.properties
merge