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

Conflicts:
	Application/Powered By Vector/CurrentReports.aspx
	Application/Powered By Vector/CurrentReports.aspx.cs