Merge origin/master

Conflicts:
	JustFindANameBank_FrontEnd/src/java/servlets/AjaxController.java