Cleaning.
Cleaning.
removed conflict related content that caused parsing error
Merge branch 'master' into plantUserRelation
Fixed intendation for Plant-class
Refractor, move upload to user from plant controller.
Add tests.