Initial setup
Merge branch 'ws_dev'

Conflicts:
	.gitignore
	app/index.html
	app/scripts/app.js
	bower.json