it works
Merge remote-tracking branch 'origin/master'

Conflicts:
	SlingApp/res/layout/activity_plant.xml