update
Merge branch 'master' of https://github.com/oogre/bcksp.es

Conflicts:
	browser-extention/chrome/bcksp.es/libs/sails.io.js
	site/public/index.html