no message
Merge branch 'gh-pages' into add_another_course_on_the_dashboard_schedule_region

Conflicts:
	public/.tmp/css/main.css
match user who currently logins to the one who made the reservation
added new template for modal
render dashboard page when selecting a new course id
created logout
changes on log in and log out
Merge branch 'implementing_merge_code' into change_template_for_the_modal

Conflicts:
	public/scripts/modules/nav/show/show_view.js
main css