merge conflict
long and lat working
tag
fix white square on map
tags working
Merge branch 'development' of github.com:tmerlet/Photoapp into development
Merge branch 'tag_update' into development
fix login form button enter
Merge branch 'maps' into development
fix seed data
Merge branch 'maps' into development
Merge branch 'development' of github.com:tmerlet/Photoapp into authorisation
minor change to ability.rb