edit
editing
Merge branch 'master' of https://github.com/StadtGarten/stadtgarten-ios-app

Conflicts:
	Database.h
	StadtgartenApp/TreeDetailViewController.m