Merge origin/InDev into InDev

Conflicts:
	src/view/ApplicationAddNewUser.java