quasi-working tags
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app
commenting UI phase
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app

Conflicts:
	api/serializers.py
	frontend/static/js/map.js
add map finally works, uses a modal and AJAX post
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app

Conflicts:
	frontend/templates/addMap.html
	frontend/templates/maps.html
integrating andys changes