Refractor of for doc types
Document types finished
Merge remote-tracking branch 'origin/doc-type'

Conflicts:
	public/js/controllers.js