...
Merge branch 'master' of https://github.com/novusidea/novusidea

Conflicts:
	dest/js/main.js
	dest/js/main.min.js