Pouch Nightly Update
Super HEAVY fix for index.html; added '.js' to 'pouchdb-nightly'
Pouchdb #2342
FCTWO-204 Review
db fixes
JSON Update for DesignMyApp Generator
Merge branch 'master' into develop
Updated Config-Class
Merge branch 'develop' of https://github.com/pixelpark/ppnet into develop

Conflicts:
	app/config.json
Mini-Bugfix
Update Config.json to match designmyapp generator
Code-Fest
Login-Fix
FCTWO-260
Added Phongap Geolocation plugin.
Added environment check.
Fixed Geolocation double prompt on iOS.
Fixed Statusbar overlay on iOS.
new App-Name
Merge branch 'develop' of https://github.com/pixelpark/ppnet into develop

Conflicts:
	app/scripts/app.js
bower update, gulp update and hello-world view
Merge branch 'release/v2.2.6'