Merge branch 'dev-master'

Conflicts:
	public/scripts/app.js
	public/scripts/controllers/Dashboard.js
	public/scripts/controllers/Document.js
	public/scripts/controllers/Folder.js
	public/scripts/form/Components.js
	public/scripts/shared/Directives.js