drag on map, yellow dot for base
Merge branch 'master' of https://github.com/scotttorgeson/ggj2013

Conflicts:
	HeartGame/Library/assetDatabase3