Merge remote-tracking branch 'jsconfuy/master'

Conflicts:
	app.js
	package.json
Add CFP text
wip for proposals
Fix package.json
Fix package.json
Add bower to package.json
Fix bower.json
Add sponsors
Fix proposals