navigation
Merge remote-tracking branch 'nazly/master' into develop

Conflicts:
	app/helpers/application_helper.rb
Merge remote-tracking branch 'ranaramez/develop'
linking courses tabs