added sidebar module
Merge branch 'master' of https://github.com/oceans15/teleport into dev

Conflicts:
	www/index.html
	www/js/app.js