Developing template
Merge branch 'feature/Nested_document' into develop

* feature/Nested_document:
  Developing template

Conflicts:
	maap_project/app/views/document.html