initial commit
entities
.
.
.
.
.
.
Merge branch 'master' of https://github.com/760379/L6TljbaMY9

Conflicts:
	composer.json
	config/autoload/local.php.dist
	module/Application/Module.php
	module/Application/config/module.config.php
	module/Application/fixture/LoadFolder.php
	module/Application/fixture/data/tag.xml
	module/Application/fixture/data/user.csv
	module/Application/mapping/Application.Entity.Cart.dcm.xml
	module/Application/mapping/Application.Entity.Folder.dcm.xml
	module/Application/mapping/Application.Entity.Image.dcm.xml
	module/Application/mapping/Application.Entity.Patient.dcm.xml
	module/Application/mapping/Application.Entity.User.dcm.xml
	module/Application/src/Application/Acl/Acl.php
	module/Application/src/Application/Controller/CartController.php
	module/Application/src/Application/Controller/FolderController.php
	module/Application/src/Application/Controller/ImageController.php
	module/Application/src/Application/Controller/UserController.php
	module/Application/src/Application/Entity/Cart.php
	module/Application/src/Application/Entity/Image.php
	module/Application/src/Application/Entity/Tag.php
	module/Application/src/Application/Entity/User.php
	module/Application/src/Application/Form/Folder.php
	module/Application/src/Application/Service/Acl.php
	module/Application/src/Application/Service/Cart.php
	module/Application/src/Application/Service/Folder.php
	module/Application/src/Application/Service/Image.php
	module/Application/src/Application/Service/Navigation.php
	module/Application/src/Application/Service/Patient.php
	module/Application/src/Application/Service/Tag.php
	module/Application/src/Application/Service/User.php
	module/Application/src/Application/View/Helper/Folder.php
	module/Application/src/Application/View/Helper/Image.php
	module/Application/view/application/cart/list.phtml
	module/Application/view/application/cart/view.phtml
	module/Application/view/application/folder/form.phtml
	module/Application/view/application/folder/list.phtml
	module/Application/view/application/folder/view.phtml
	module/Application/view/application/image/list.phtml
	module/Application/view/application/image/view.phtml
	module/Application/view/application/search/form.phtml
	module/Application/view/application/search/result.phtml
	module/Application/view/application/user/list.phtml
	module/Application/view/application/user/view.phtml
	module/Application/view/layout/layout.phtml
	module/Application/view/layout/top-menu.phtml
	public/css/style.css
	public/index.php