after build 0.1.1
Merge branch 'master' of https://github.com/scandio/scandiojs

Conflicts:
	dist/scandio.min.js
	dist/scandio.min.map

Manual merge!