fixes for live site

fixed https redirection, some minor updates to reporting for consistency
nt
Merge remote-tracking branch 'origin/master'

Conflicts:
	reporting/tasks/files/smartstartertraining_pickacard_users_09172014.xls