some tmp file update
some bug fixing and update old functions
1. added password in add and edit user form
2. add unique constrain on frn number
some bug fixing and update old functions
Merge branch 'dev-master'

Conflicts:
	public/scripts/controllers/Company.js
	public/scripts/controllers/User.js
	public/scripts/form/Components.js
	public/views/users.blade.php