Removed useless code.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/mapper/AccountMapper.java