remove repetitions in Gruntfile
Merge branch 'development'
fix Gruntfile changes
fix merge conflict
remove merge conflict changes
Bump version v0.6.2
Merge branch 'development'