Changed to a better drag queen
Merge branch 'master' of https://github.com/samsonoris/ep

Conflicts:
	public/admin/js/controllers/EditCtrl.js