Merge branch 'release/v4.0.0' into develop
safari 7 grid fix
Merge branch 'hotfix/v4.0.1' into develop
upped version to v4.0.2
Merge branch 'release/v4.0.2'