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

Conflicts:
	RepsUk.Office/WebApp/clients/client-types-edit-modal.html
	RepsUk.Office/WebApp/clients/clients-table.html
	RepsUk.Office/WebApp/clients/clientsModule.js
	RepsUk.Office/WebApp/core.js
	RepsUk.Office/WebApp/dashboard/dashboard-main.html
	RepsUk.Office/WebApp/dashboard/dashboardModule.js
	RepsUk.Office/WebApp/greeters/greeters-edit.html
	RepsUk.Office/WebApp/greeters/greeters-table.html
	RepsUk.Office/WebApp/greeters/greetersModule.js
	RepsUk.Office/WebApp/invoicing/invoicing-edit.html
	RepsUk.Office/WebApp/invoicing/invoicingModule.js
	RepsUk.Office/WebApp/jobs/jobs-edit.html
	RepsUk.Office/WebApp/jobs/jobs-table.html
	RepsUk.Office/WebApp/jobs/jobsModule.js
	RepsUk.Office/WebApp/jobs/min/jobsModule-ck.js
	RepsUk.Office/WebApp/jobs/schedule-printout.html
	RepsUk.Office/WebApp/layout/layoutModule.js
	RepsUk.Office/WebApp/layout/login.html
	RepsUk.Office/WebApp/layout/topnav.html
	RepsUk.Office/WebApp/min/core-ck.js
	RepsUk.Office/WebApp/payments/payments-generate.html
	RepsUk.Office/WebApp/payments/paymentsModule.js
	RepsUk.Office/WebApp/settings/airport-edit-modal.html
	RepsUk.Office/config.codekit
	RepsUk.Office/includes/css/base-style.css
	RepsUk.Office/includes/css/style.css
	RepsUk.Office/includes/less/base-style.less
	RepsUk.Office/index.html
commit
commit