new changes - dan
Merge branch 'master' of https://github.com/xiitec/graph

Conflicts:
	View/Pages/home.ctp