Merge branch 'integration' into release
Removing submodules as they don't contain code useful for running the application.
tests are not relevant on the final release
Merge branch 'integration' into release
No specs on release
Merge branch 'integration'
Merge branch 'integration' into release
version bump
Adding link to phonegap build-page
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
Merge branch 'release' into gh-pages

# By Martin Reurings (5) and windgazer (3)
# Via Martin Reurings (4) and windgazer (3)
* release:
  Just a WIP
  Removing Jasmine as a submodule (now handled through node)
  Adding JSProject 'framework'
  Adding link to phonegap build-page
  version bump
  No specs on release
  tests are not relevant on the final release
  Removing submodules as they don't contain code useful for running the application.

Conflicts:
	.gitmodules