Fix layout form in modal (remove margin)
Fix merge popup layout
Merge branch 'master' of github.com:CIRB/django-fixmystreet