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

Conflicts:
	Model/src/InitDMS.sql
commit
function Authority done!
roleFunction.xml  attribute add