Working on form for map view
Merge branch 'master' into map_form
Making sure branch has up-to-date master
Merge pull request #60 from red-admirals-2014/map_form

Map form