Merge remote-tracking branch 'upstream/master' into Metering
Merge remote-tracking branch 'upstream/master' into Metering
Added registered user metering. Only need to update messaging and figure out a way to call Clickshare when session over.
Slight mods to metering to avoid unnecessary calls to Clickshare.
Merge remote-tracking branch 'upstream/master' into Metering

Conflicts:
	app/js/models/user.js
Fixed user.js model
Merge pull request #6 from shane-beliveau/Metering

 Added registered user metering. Only need to update messaging and figure out a way to call Clickshare when session over.