phoebe: event listener: double click = adding a pin; may want to do a form so can add info to the caution pin
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project into phoebeBranch
fixed merge errors.. added "drop pin" options for cautions
Conflicts:
	userinterface/js/maps.js
phoebe: "add-pin" functionality (extra feature.. may need more design for this before implementing)
phoebe: fixed flag zooming out stuff; added a legend.
phoebe: added id to top bar; and comment in js about positioning navbar. use google maps for positioning it? potentially
phoebe: starting to add elevator icons... added real locations of accessible entrances.
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project into newPhoebeBranch
phoebe: mergeee
phoebe: added elevator marker to stokes, and added to legend
phoebe: added basic form to dynamic marker infowindow
added double-click flag functionality; TODO: FINISH AJAX CALLS; and added a one line space between legend title in mergedindex.html
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project into newPhoebeBranch
Phoebe: tryna merge ahhh
Conflicts:
	userinterface/js/maps.js
phoebe: trying to merge again..
phoebe: surrounded my edits with PHOEBE EDIT and END PHOEBE EDIT
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project into newPhoebeBranch
phoebe: merging again... meh
Conflicts:
	userinterface/js/maps.js
phoebe: updated elevator icon to black background, white people

 Please enter the commit message for your changes. Lines starting
phoebe: added time stamps and to saveMarker; changed marker to double click (double click zoom now disabled as well)
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project into newPhoebeBranch
phoebe: mergeee
phoebe: moved placement of timestamp to description of marker
-timeStamp is just month date and year right now
phoebe: changed elevatorIcon, added PHOEBE EDITS to maps.js
Merge branch 'master' of https://github.com/dirkstahlecker/ppat_project
phoebe: really merging!
Conflicts:
	userinterface/js/maps.js