* Fixes
Merge branch 'origin/develop'

Conflicts:
	UserSecurityManager/src/main/java/com/junolabs/usm/persistence/dao/mysql/UserMySQLDAO.java