Contact hecho
Merge branch 'master' of https://github.com/cobianzo/rrdcreative

Conflicts:
	db-dumps/2014-02-22-rrdstatic-user.sql