amended the code so the argmap looks for a forceSecureTracker boolean
property which if it exists and is set to true will force the tracker to
run over https
Merge branch 'kujo4pmZ-forceHTTPS' into feature/2.1.0

Conflicts:
	src/js/tracker.js