up by fasil
up
up
Merge branch 'master' of github.com:snasir/styleClub

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_style_club_list
	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_default_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log