* commit for #27 and #28 * updated layout
Applications for signed in users
now restarting app on heroku after deployment
added newrelic for performance monitoring on deployed server
* added link to chairs path on top menu
Role model and restricted applications
Merge branch 'master' into develop-ak

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/scaffolds.css.scss
	app/models/job_offer.rb
	app/views/job_offers/show.html.erb
	app/views/layouts/application.html.erb
	db/schema.rb
	db/seeds.rb
	spec/models/job_offer_spec.rb
	spec/spec_helper.rb
Merge branch 'develop' into develop-ak

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/scaffolds.css.scss
	app/models/job_offer.rb
	app/views/job_offers/index.html.erb
	app/views/job_offers/show.html.erb
	app/views/layouts/application.html.erb
	db/schema.rb
	db/seeds.rb
	spec/factories/joboffer.rb
	spec/models/job_offer_spec.rb
commit just for sync with felix, needs progress, #35
fixed some issues regarding new and existing ratings and students #35
removed debugger from students controller
added deputy to chair, added UI
Association between users and chairs for WiMis
added chair reference to user and vice-versa
Merge branch 'develop-ak-change-deputy' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak-change-deputy

Conflicts:
	app/models/chair.rb
	db/schema.rb
integrated review comments
Merge pull request #85 from tkowark/develop-ak-change-deputy

added deputy to chair, added UI
Merge pull request #86 from tkowark/develop-ak

Merging develop-ak into develop
Merge branch 'develop-js' into develop-js-rating

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/controllers/students_controller.rb
Merge branch 'develop' into develop-js-rating

Conflicts:
	Gemfile.lock
	db/schema.rb