Users
Updates
Merge branch 'master' of https://github.com/sumerjoshi/asset-management-product

Conflicts:
	Asset Management/Core/ICore.java
	Asset Management/Users/IUser.java
fixed merge