Merge remote-tracking branch 'origin/master'

Conflicts:
	tbs/src/main/java/mum/cs490/tbs/controller/UserBean.java