[*] Symfony library is updated up to latest version
E:0040373 [*] [*] The Doctrine library is updated up to latest version (2.2)
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
Merge branch 'master-dev' into vvs-doctrine

Conflicts:
	src/Includes/Decorator/DataStructure/Graph/Classes.php
	src/restoredb
E:166421 [!] Wrong location for autogenerated getters and setters of Doctrine models. Fixed
Merge branch 'master-dev' into vvs-doctrine

Conflicts:
	src/upgrade/1.0/22/post_rebuild.php
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
[+] New Currency view model class is added initially.
Merge branch '1.0.x' into vvs-doctrine

Conflicts:
	.dev/code-sniffs/XLite/NameSniff.php
	src/Includes/Decorator/plugins.ini
	src/classes/XLite/Model/OrderItem.php
E:0040373 [*] The Doctrine library is updated up to latest version (2.2)
Merge branch 'master-dev' into joy-currency-edit-page
[*] Currency management page further changes.
Merge branch 'master-dev' into joy-currency-edit-page
[*] Small logic changes
[*] StickyPanel widget refactoring.
[*] Currency edit page further changes.
Merge branch 'master-dev' into joy-currency-edit-page