Icon/loader changes, file moves
Merge branch 'master' of https://github.com/greywillfade/TeaTracker

Conflicts:
	tea/index.html