stuff
Merge branch 'master' of https://github.com/Sentiaio/app.sentia.io

Conflicts:
	public/stylesheets/main.styl
Merge branch 'master' of https://github.com/Sentiaio/app.sentia.io

Conflicts:
	public/javascripts/app.js
	public/stylesheets/main.styl
	public/stylesheets/style.css
fixes