Working on nested document
Commit to enable git flow
Merge branch 'new_features' into feature/Nested_document

Conflicts:
	maap_project/app/scripts/controllers/DocumentCtrl.js
	maap_project/app/views/document.html
Nested document working, only 1 level of inception
Developing template
New icons, finished nested document client side
Merge branch 'feature/Nested_document' into develop

* feature/Nested_document:
  Developing template

Conflicts:
	maap_project/app/views/document.html