merge branch 'master' of https://github.com/CODINGVOICE/DMS.git

Conflicts:
	View/public_html/dms/function/authority.jsff

commit
commit!