updated image stuff
Merge branch 'develop' of https://github.com/CS180Fall2014/UcrRunner
into develop

Conflicts:
	app/src/main/java/com/murraycole/ucrrunner/controller/Map/MapInformation.java