Merge branch 'jquery-sortable'
corrected formatting
cleaned up
corrected formatting
corrected formatting
Merge branch 'master' into jquery-sortable