JS boxes
Merge branch 'master' of https://github.com/davidwan/wth-home

Conflicts:
	manage.py
	wthome/settings.py
	wthome/urls.py.orig
	wthome/wsgi.py