server running jade
Added API for jobs and videos
no message
Added support for filtering content by tags
angular
Added lodash to package.json
Merge branch 'master' into tinder

Conflicts:
	server/main.js
Merge remote-tracking branch 'origin/master' into tinder
Merge branch 'master' of https://github.com/Infusion-Labs/portal into globe