update db credentials
update authentication query
Merge branch 'arjay.com.firefly.dev' into firefly.tri-accounting.dev

Conflicts:
	src/main/java/com/tri/erp/spring/service/implementations/UserServiceImpl.java
test
Merge branch 'firefly.tri-accounting.dev' into lester.com.firefly.dev

Conflicts:
	tri-accounting.iml