Hi
Merge branch 'master' of https://github.com/cmtl1990/clinicacentral

Conflicts:
	app/tmp/cache/cake_toolbar_cache
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_es-es
	app/tmp/cache/persistent/myapp_cake_core_cake_es-es
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_es-es
	app/tmp/cache/persistent/myapp_cake_core_file_map
persistent
gitnore