Fixed .css and .js issues.
Merge branch 'master' of https://github.com/adriannieto/gids-and-imds-uma-master-2014

Conflicts:
	tasks/pipeline.js
	views/layout.ejs