update sidebar
Merge branch 'master' of https://github.com/devLabel/vikasa-ui

Conflicts:
	app/index.html
	app/views/join.html
	app/views/login.html
sidebar