temp file after build of application
changed mail server details with client given details
Point 2,5 11 has been resolved which mentioned by client in list with red color
Merge branch 'dev-master'

Conflicts:
	app/config/mail.php
	public/scripts/controllers/Folder.js
	public/scripts/controllers/User.js
	public/scripts/pages/Controllers.js