Merge branch 'gh-pages' of https://github.com/Sentido-Labs/monitoring-platform into day-7

Conflicts:
	js/site.js
Merge branch 'day-7' of https://github.com/Sentido-Labs/monitoring-platform into day-7