Merge branch 'integration'
version bump
Adding JSProject 'framework'
Removing Jasmine as a submodule (now handled through node)
Just a WIP
Merge branch 'feature-releaseinfo' into integration

# By windgazer (3) and Martin Reurings (1)
# Via Martin Reurings (1) and windgazer (1)
* feature-releaseinfo:
  Just a WIP
  Removing Jasmine as a submodule (now handled through node)
  Adding JSProject 'framework'
  version bump
Merge branch 'integration' into release

# By windgazer (3) and Martin Reurings (1)
# Via windgazer (2) and Martin Reurings (1)
* integration:
  Just a WIP
  Removing Jasmine as a submodule (now handled through node)
  Adding JSProject 'framework'
  version bump

Conflicts:
	.gitmodules