Merge origin/master

Conflicts:
	src/Liwei/DefaultBundle/Controller/DefaultController.php