Changes in userrole
User roles Edit Change
Changes in all the edit and delete
Changes Done
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	nbproject/private/private.xml