Merge branch 'master' into develop

* master:
  Bugfix: Studyplan - Improved button script
Merge tag 'fix-english-study-plan' into develop

Bugfixed - English studyplan

* tag 'fix-english-study-plan':
  Fixed english study plan bug
Handlebars improvements

- Added handlebars to the JS-package
- Added options to the handlebars task

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
HBs templating

- Rewrote the hbs templates to use the packaged templates instead of templates from the view
- Removed hbs templates from the views

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Updated gitignore

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Integrated leaflet.js

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Merge branch 'feature/add-leafletjs-inline' into feature/view-for-article-api

* feature/add-leafletjs-inline:
  Integrated leaflet.js

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>

Conflicts:
	bower.json
Removed leaflet from head

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>
Merge branch 'feature/add-leafletjs-inline' into feature/view-for-article-api

* feature/add-leafletjs-inline:
  Removed leaflet from head
cleanup

Signed-off-by: Kenneth Dahlstrøm <kenneth@keda.no>