#326 integrated styles, javascripts and main template from new website templates
#326 hack for navbar implemented
#324 job offer pages working

increased job offer pagination to 15 job offers per page
#324 continued integrating new layout.
Merge remote-tracking branch 'origin/develop' into new-homepage

Conflicts:
	app/views/devise/sessions/new.html.erb
	app/views/layouts/application.html.erb
	app/views/staff/index.html.erb
	app/views/students/index.html.erb
	app/views/students/show.html.erb
	config/routes.rb
	spec/controllers/home_controller_spec.rb
continued work -.- #326
admin student acitvation and translations
student and employer activation controller actions
activated batches
employer and student activation buttons
hiding not activated students and employers
Emails to the administration for activation
Account settings with change password functionality
Merge remote-tracking branch 'origin/develop' into new-homepage

Conflicts:
	Gemfile.lock
	app/views/students/show.html.erb
	config/routes.rb
Added category to job_offer #329
restricting access rights for deactivated students and employers/staff
Merge branch 'develop' into feature/activation

Conflicts:
	app/controllers/students_controller.rb
	app/models/ability.rb
	app/views/students/_profile_fields.html.erb
adapted all sites to new design #324
added category_id
Merge branch 'develop' into feature/Job-offer-page