features for #128
Merge branch 'develop-ak' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak

Conflicts:
	db/seeds.rb