show user list
format date - updatedAT
Merge branch 'firefly.tri-accounting.dev' into arjay.com.firefly.dev

Conflicts:
	src/main/webapp/WEB-INF/views/admin/user/partials/user-list.jsp
Merge branch 'arjay.com.firefly.dev' into user-mgt.arjay.com.firefly.dev
roll back inspinia