Merge branch 'hotfix/available' into develop
upgrade to grunt 0.4x
Merge branch 'release/0.1.1'