commit
Merge https://github.com/tarpitgrover/RepsUk

Conflicts:
	RepsUk.Office/WebApp/invoicing/invoicing-edit.html
	RepsUk.Office/WebApp/invoicing/invoicingModule.js
	RepsUk.Office/WebApp/invoicing/min/invoicingModule-ck.js
	RepsUk.Office/WebApp/jobs/jobsModule.js
	RepsUk.Office/WebApp/jobs/min/jobsModule-ck.js
	RepsUk.Office/WebApp/min/login-ck.js
	RepsUk.Office/includes/css/base-style.css
	RepsUk.Office/includes/css/style.css