Merge origin/master

Conflicts:
	src/model/bean/UserBean.java
	src/presenter/LoginPresenter.java
	src/view/ui/LoginScreenView.java