Minor changes
Reverting change I wasnt supposed to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl