#2 fix the dropdownmenu problem + change on nav-bar
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/account/login/login.controller.js
	client/app/admin-data/admin-data.controller.js
	client/app/my-tour-step/my-tour-step.map.service.js
	client/components/tour/steppoint.repository.js
	server/api/steppoint/index.js
	server/api/steppoint/steppoint.controller.js
	server/api/steppoint/steppoint.model.js
	server/api/steppoint/steppoint.socket.js
	server/api/steppoint/steppoint.spec.js