11
Merge branch 'master' of https://github.com/irynaLv/FlowersDB

Conflicts:
	backend/.idea/workspace.xml
	frontend/build/production/FlowersDB/app.js
	frontend/build/temp/production/FlowersDB/slicer-temp/theme-capture.png