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

Conflicts:
	app/Controller/UsersController.php
	app/View/Users/account.ctp
	app/tmp/cache/models/myapp_cake_model_default_style_club_list
	app/tmp/cache/models/myapp_cake_model_default_style_club_users
up
up
Merge branch 'master' of github.com:snasir/styleClub

Conflicts:
	app/Controller/UsersController.php