working
Merge branch 'master' of https://github.com/bhupeshg/estore

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_unbrako_list
	app/tmp/cache/models/myapp_cake_model_default_unbrako_users
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
completed cart page and added address page