Flushing things out.
Merge branch 'develop' of https://github.com/shsu/comp4911 into develop

Conflicts:
	src/main/java/ca/bcit/infosys/comp4911/access/UserDao.java