Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java

updated locations
Merge pull request #3 from jmorana/master

master