layout fixed
Merge branch 'dev' of github.com:lealtag/angular-cristo into dev

Conflicts:
	app/views/graph.html