Merge branch 'hotfix/headings2'
Merge branch 'release/v2.1.3'
Merge branch 'release/v2.1.4'
Merge branch 'release/v2.1.5'
Merge branch 'release/v2.5.0'
Merge branch 'release/v3.0.0'
Merge branch 'release/v3.0.1'
Merge branch 'release/v3.1.0'
Merge branch 'release/v3.1.1'
Merge branch 'develop'
Merge branch 'release/v3.1.2'
Merge branch 'release/v3.2.0'
Merge branch 'release/v3.3.0'
Merge branch 'release/v4.0.0'
safari 7 grid fix
upped version to v4.0.1
Merge branch 'hotfix/v4.0.1' into develop