update asset
optimized scope
Merge branch 'master' of https://github.com/jentzheng/rails4-app
update mass
rolify init
cancan init
update mass
add sortable block