Merge remote-tracking branch 'origin/develop' into develop-js

Conflicts:
	Gemfile.lock
	db/schema.rb
Merge branch 'develop-js' of github.com:tkowark/hpi-hiwi-portal into develop-js

Conflicts:
	db/schema.rb