issue #27 changes in links and views of academics users and profiles
Merge branch 'modifying_the_views' into form_submission_state_machine

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/controllers/academics_controller.rb
	app/controllers/application_controller.rb
	app/controllers/profiles_controller.rb
	app/helpers/academics_helper.rb
	app/helpers/profiles_helper.rb
	app/models/academic.rb
	app/models/profile.rb
	app/models/user.rb
	app/views/academics/edit.html.erb
	app/views/academics/new.html.erb
	app/views/academics/show.html.erb
	app/views/profiles/_form.html.erb
	app/views/profiles/edit.html.erb
	app/views/profiles/new.html.erb
	app/views/profiles/show.html.erb
	app/views/static_pages/home.html.erb
	app/views/users/sessions/_form.html.erb
	app/views/users/sessions/new.html.erb
	config/initializers/state_machine_patch.rb