Updated subscription navigation + Added method to store all articles on load.
Merge remote-tracking branch 'upstream/master' into Metering
Merge branch 'Metering' of https://github.com/shane-beliveau/cdbapp
New splash logo
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.
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
Added registered user metering.

Only need to update messaging and figure out a way to call Clickshare
when session over.
Fixed broken conditionals in article templates
Add x88 ad position to filmstrips
Bug fixes
Fixed embedded video issue in offline mode

Instead of loading the video when the article loads, it will load an
image with a link to the iframe, which when clicked on, will load the
video player into the DIV. Disables video load when offline.
Add Refresh button to splash screen
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/js/models/user.js
	app/js/views/article.js
	app/js/views/thenews.js
	app/templates/article/meter_expired.html