merge conflict
Merge branch 'master' of github.com:nadirq/freelens.us
migrations update. Add Placemark  with pohtos