slight more stuff working
Merge branch 'master' of https://github.com/chang47/LunchWithFriends

Conflicts:
	templates/js/map.js
resolved more conflicts
third somewhat working copy