temp file after build of application
fixed few bugs and add small functions
fix bugs assign by qa & client
Merge branch 'dev-master'

Conflicts:
	app/controllers/DashboardController.php
	app/controllers/UsersController.php
	public/scripts/app.js
	public/scripts/controllers/Company.js
	public/scripts/controllers/Dashboard.js
	public/scripts/controllers/Document.js
	public/scripts/controllers/Folder.js
	public/scripts/controllers/User.js
	public/scripts/ui-components/Alerts.js