cleanup merging thurs pm
fixed serializers merge
Merge branch 'master' of git://github.com/food-mappers/food-mapper-app into tagging
updated