preparing to pull
Merge branch 'master' of github.com:AdmitHub/Admit

Conflicts:
	settings.json
	tests/.reports/jasmine-unit/TEST-Couponmethods.xml
	tests/.reports/jasmine-unit/TEST-Productrecords.xml
	tests/.reports/jasmine-unit/TEST-Producttotals.xml
	tests/a1-package-stubs.js
adding force ssl