remove html files
dyncamically create html directory if it doesn't exist
Fix bad URL for site 1
Update no records view to include icons for other assets
updated player for clip pre-rolls; updated message for asset not found; removed image node in article.jade when no image is present.
Removed logos from GameOn logo
npm update
npm update
added settings ui
adding passport module
html ignore
changes to settings jade
updated limelight.js to remove console logs
Working on passport
changes to settings js
Authentication logic for paid content
Merge branch 'authentication'

Conflicts:
	.gitignore
	node_modules/express/node_modules/accepts/node_modules/mime-types/index.js
	node_modules/express/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/LICENSE
	node_modules/express/node_modules/accepts/node_modules/mime-types/package.json
	node_modules/express/node_modules/accepts/package.json
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/finalhandler/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/media-typer/package.json
	node_modules/express/node_modules/on-finished/HISTORY.md
	node_modules/express/node_modules/on-finished/LICENSE
	node_modules/express/node_modules/on-finished/README.md
	node_modules/express/node_modules/on-finished/index.js
	node_modules/express/node_modules/on-finished/node_modules/ee-first/README.md
	node_modules/express/node_modules/on-finished/node_modules/ee-first/index.js
	node_modules/express/node_modules/on-finished/node_modules/ee-first/package.json
	node_modules/express/node_modules/on-finished/package.json
	node_modules/express/node_modules/qs/package.json
	node_modules/express/node_modules/range-parser/package.json
	node_modules/express/node_modules/send/package.json
	node_modules/express/node_modules/serve-static/package.json
	node_modules/express/node_modules/type-is/node_modules/mime-types/index.js
	node_modules/express/node_modules/type-is/node_modules/mime-types/package.json
	node_modules/express/node_modules/type-is/package.json
	node_modules/express/node_modules/vary/package.json
	node_modules/express/package.json
	package.json
Fix package.json files due to merge
Merge remote-tracking branch 'heroku/master'

Conflicts:
	.gitignore