CategoryAdministrationPresenter.java
Merge remote-tracking branch 'remotes/origin/Version_0_1' into Version_0_1

Conflicts:
	educatus/src/educatus/resources/educatus.css
Merge remote-tracking branch 'remotes/origin/Version_0_1' into Version_0_1