test new sortable with rutorika/sortable
Merge branch 'master' of git://github.com/subbly/framework

Conflicts:
	composer.json