Browserstudios:errors
Merge branch 'master' of https://github.com/MHerszak/lopmherror

Conflicts:
	package.js
	smart.json