- merged branch 1.2.0.1 with zusearchive branch

Signed-off-by: jroeder <julian.roeder@fu-berlin.de>
Merge branch 'zusearchive' of
https://github.com/imeji-community/imeji.git into zusearchive

Conflicts:
	pom.xml