css test
Merge branch 'master' of github.com:lightxu/SESS

Conflicts:
	sess_web/app/cache/dev/appDevDebugProjectContainer.php
	sess_web/app/cache/dev/appDevDebugProjectContainer.php.meta
	sess_web/app/cache/dev/appDevDebugProjectContainer.xml
	sess_web/app/cache/dev/appDevDebugProjectContainerCompiler.log
	sess_web/app/cache/dev/appDevUrlGenerator.php.meta
	sess_web/app/cache/dev/appDevUrlMatcher.php.meta
	sess_web/app/cache/dev/assetic/routing.yml
	sess_web/app/cache/dev/classes.php
	sess_web/app/cache/dev/classes.php.meta
	sess_web/app/cache/dev/profiler/index.csv
	sess_web/app/logs/dev.log
	sess_web/src/StockAccount/IndexBundle/Resources/views/Default/index.html.twig
Merge branch 'master' of github.com:lightxu/SESS

Conflicts:
	sess_web/src/Stock/AccountBundle/Controller/AccountController.php
	sess_web/src/Stock/AccountBundle/Entity/NaturalCustomer.php
	sess_web/src/Stock/AccountBundle/Resources/config/doctrine/NaturalCustomer.orm.yml