clean up and live reload
Merge branch 'v2.0' of github.com:Iteam1337/Wejay into v2.0

Conflicts:
	js/setup.js