cc
iiMerge branch 'master' of https://github.com/pcsquirrel/ionic-app-base

Conflicts:
	www/lib/ionic/js/ionic.bundle.js
	www/pflanze.html