Merge remote/master

Conflicts:
	src/java/commands/CreateAccountCommand.java
	web/style/css/employee.css