e
Merge branch 'master' of https://github.com/catskay/yoga

Conflicts:
	app/controllers/EditingController.php
dd