added ci_server branch for testing on the pse3 server
added ci_server branch for testing on the pse3 server
Merge branch 'master' into ci_server

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'origin/view_refactoring_adrian' into ci_server
merged new view in ci_server
Merge remote-tracking branch 'origin/master' into ci_server
made a new section for server used gems in gemfile
created invitation controller stubs
first step for confirmation implementation, language support needs to be implemented in the mail method
added localized mailer
Merge branch 'master' into ci_server
Merge branch 'mailing' into ci_server
uncommented JS-gems
bug fix with user2
mailing fixed
Merge branch 'mailing' into ci_server
using sendmail
bootstrap style for pw-field
Merge branch 'refs/heads/master' into invitation
Merge branch 'refs/heads/mailing' into invitation