update
Merge remote-tracking branch 'origin/master'

Conflicts:

	upark/upark-core/src/main/java/edu/bu/heptagon/upark/dao/UserAccountDAO.java

	upark/upark-core/src/main/java/edu/bu/heptagon/upark/services/LoginServiceImpl.java