Order grunt tasks alphabetically
Order grunt packages alphabetically
Merge branch 'develop'