Updated view files
Resolved conflicts
Merge branch 'master' of https://github.com/BasicYoose/Flower
Merge branch 'master' of https://github.com/BasicYoose/Flower
Meta-inf