Removed Nginx symlink and created a Puppet template
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend
Merge branch 'feature/frontend' of github.com:akvo/akvo-flow into feature/frontend
Updated translation, local VM setings

- Removed non used Rake commands
- Changed local VM configs
- Updated translations with new strings

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