Merge branch 'master' into g33k1ns1d3's-l0cal

Conflicts:
	www/js/app/src/component.js
	www/js/app/src/monlift.js
	www/js/app/src/ui.js