#880 Code cleaning
Merge branch 'master' of github.com:europeana/portal

Conflicts:
	portal2/src/main/java/eu/europeana/portal2/web/controllers/admin/AdminController.java