Lots of stuff

Not a clue exactly what I did
Merge branch 'master' of https://github.com/TechTrinkets/techtrinkets

Conflicts:
	build/web/account.jsp
	build/web/login.jsp
	web/account.jsp
	web/login.jsp