Merge branch 'dioramaReport' into api
first narrative persistence to server
Merge branch 'api' of github.com:unepwcmc/NRT into api

Conflicts:
	public/clientApp/js/application.js
	public/clientApp/src/templates/narrative-edit.hbs
	public/clientApp/src/views/narrative_view.coffee
Merge pull request #2 from unepwcmc/api

Api