Merge branch 'master' of https://github.com/scardine/graficos

Conflicts:
	js/app/controllers.js