home
Merge branch 'master' of https://github.com/xiitec/graph

Conflicts:
	Controller/UsersController.php
	View/Users/forgotpass.ctp
	tmp/cache/models/myapp_cake_model_default_graph_list
	tmp/cache/models/myapp_cake_model_default_graph_users
	tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	tmp/cache/persistent/myapp_cake_core_cake_en-us
	tmp/cache/persistent/myapp_cake_core_default_en-us
	tmp/cache/persistent/myapp_cake_core_file_map
	tmp/cache/persistent/myapp_cake_core_method_cache
	tmp/logs/error.log