Tidy.
Merge branch 'v2tt6' of github.com:invertedtomato/ChERP into v2tt6

Conflicts:
	WebInterface/Backend/Controllers/API/BaseController.cs
	WebInterface/default.aspx