Merge branch 'feature/sub-org' of https://github.com/thenhkid/universalTranslator into feature/password
encrypt pw before pw column removal

Admin Menu, Spring Security Changes
added login as to sys admin
added roleid of 4 to have login as access also
need to add logging to loginAs
after adding login as to org's user page
job to update salt and encrypted pw column
removed js alert
Merge tag 'release-1.2' into develop

1.2
Merge remote-tracking branch 'origin/master' into password

Conflicts:
	dbUpdates.txt
	src/main/java/com/ut/dph/security/CustomAuthenticationHandler.java
Merge branch 'develop' of https://github.com/thenhkid/universalTranslator into feature/password
removed password column from db, changed to transient
ordered login as users by org name
need to put back salt and encrypted pw if user is not updating pw
should not default confirm pw
added settings to drop down menu and footer for user to update their info
getting ready for new mail server info
fix authentication issue when user updates their user name
changed mail server properties to read from properties file
removed system.out.print line