#broken
#broken
merged user.rb and student.rb in one table.
- missing adapting tests
- missing adapting student serach
- missing fixin all the links
Merge branch 'develop-js' into develop-js-faq

Conflicts:
	app/views/job_offers/new.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
fixed i18n link
Merge remote-tracking branch 'origin/develop-js' into develop-js-mail

Conflicts:
	app/controllers/students_controller.rb
	app/models/chair.rb
	app/models/student.rb
	app/views/students/_form.html.erb
	app/views/students/index.html.erb
	app/views/students/show.html.erb
	config/routes.rb
	db/schema.rb
	db/seeds.rb
Merge remote-tracking branch 'origin/develop-js-faq' into develop-js-mail

Conflicts:
	config/routes.rb
	db/seeds.rb
Merge remote-tracking branch 'origin/develop-js-faq' into develop-js-mail
Merge remote-tracking branch 'origin/develop' into develop-js-mail
Merge remote-tracking branch 'origin/develop' into develop-js-mail

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
	db/migrate/20131110165030_add_attachment_photo_to_students.rb
	db/migrate/20131115101455_add_attachment_cv_to_students.rb
	db/schema.rb
	db/seeds.rb
#brokenTests refactored the most. Everythin looks fine, but most test are broken. Even for classes I haven't touched.
Merge remote-tracking branch 'origin/develop' into develop-js-mail

Conflicts:
	app/views/students/_form.html.erb
	app/views/students/show.html.erb
Merge remote-tracking branch 'origin/master' into develop-js-mail
#broken 20 Test are still remaining to fix. Nearly done with refactoring our model structure
some test fixes
test and fix

vor acht
Merge branch 'develop-js-mail' into develop

Conflicts:
	app/controllers/students_controller.rb
	app/models/programming_language.rb
	app/models/programming_languages_student.rb
	app/models/student.rb
	app/models/student_status.rb
	app/models/user.rb
	app/views/students/index.html.erb
	app/views/students/show.html.erb
	config/environments/development.rb
	config/routes.rb
	db/seeds.rb
	spec/factories/role_factory.rb
	spec/factories/student_factory.rb
	spec/factories/user_factory.rb
	spec/mailers/job_offer_mailer_spec.rb
	spec/models/job_offer_spec.rb
	spec/models/student_spec.rb
Merge branch 'develop' of github.com:tkowark/hpi-hiwi-portal into develop

Conflicts:
	app/controllers/students_controller.rb
	spec/models/student_spec.rb
	spec/views/students/index.html.erb_spec.rb