Dan's map change...
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:
	Beep/res/drawable-hdpi/map_background_panel_1.png
	Beep/res/drawable-hdpi/map_background_panel_5.png
	Beep/res/drawable-hdpi/map_background_panel_6.png
	Beep/res/drawable-hdpi/map_node.png
	Beep/res/drawable-hdpi/node_overlay.png
	Beep/res/layout/activity_map.xml