Moved css include to the template
Fixed search
Merge branch 'master' into testing

Conflicts:
	app/views/index.jade