delete categories, added upload form
Merge remote-tracking branch 'origin/master'

Conflicts:
	target/classes/.gitignore
	target/m2e-wtp/web-resources/META-INF/maven/Bank1/Bank1/pom.properties