Merge branch 'release/v2.1.5' into develop
updated blocss submodule to v2.5.0
Bumped up version to v2.5.0, framework is ready for v3
Merge branch 'release/v2.5.0'