Fix to the future Nginx conf
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend
Updated Nginx conf to match the old namespaces
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend
Removed unused old code from the maps view.

. #109
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend