iok
Merge branch 'master' of https://github.com/pcsquirrel/ionic-app-base

Conflicts:
	www/js/app.js
	www/main.html
	www/pflanze.html