lots of stuff
Merge branch 'master' of https://github.com/Vector-usu/Tramps

Conflicts:
	Application/Powered By Vector/AlterItem.aspx
	Application/Powered By Vector/NewUser.aspx