temp file after build of application
resolve few bugs
Merge branch 'dev-master'

Conflicts:
	public/scripts/controllers/Document.js
	public/scripts/controllers/User.js