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
Merge branch 'master' into ci_server
Merge branch 'mailing' into ci_server
uncommented JS-gems
bug fix with user2
Merge branch 'mailing' into ci_server
using sendmail
does it work now? ;)
Fixed bug and created and adapted view. To-Do: Controller.
Adapted controller. Untested.
added first sign up test and a static index test
added first sign up test and a static index test
added sign in test. not working yet
added login_spec.rb