update user
Merge branch 'arjay.com.firefly.dev' into firefly.tri-accounting.dev

Conflicts:
	src/main/java/com/tri/erp/spring/service/implementations/UserServiceImpl.java