updated all dependencies to fix composer.lock bad merges
fixed mbr_language table name in SQL dump
removed buzz client, minor changes (comments, var names)
converted annotations mappings to yaml, removed @ORM annotations from 4 entities (test)
Delete composer.lock
Delete composer.lock
deleted
created DomainModelsBundle and moved PHP model classes so that entities mappings and classes are separated
replaced "ApiBundle\Entity" occurrences with "DomainModelsBundle\Entity"
reverted Structure entities to ApiBundle (no need for them in DomainModels as api clients won't operate such a models), configured @ORM for ApiBundle and yaml for DomainModels
Merge branch 'develop' into zjoia_master
Merge remote-tracking branch 'zjoia_master/master' into zjoia_master

Conflicts:
	src/Wun/Orchid/ApiBundle/Controller/Rest/AccountTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/AddressController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/AddressOptinAuditController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/AddressTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/BusinessController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/ContactController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/ContactTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/CountryController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/EmailController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/EmailOptinAuditController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/EmailTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/EmailValidateController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/FlagTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/IsoCodeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/LanguageController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/MemberFlagAuditController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/MemberLoginAuditController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/MemberMetaController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/MemberSiteController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/MemberStatusTypeAuditController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/MetaTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/OptinTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/PhoneController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/PhoneOptinAuditController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/PhoneTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RankController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RankMetaController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RankRequirementController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RankRequirementTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RankRewardController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RankRewardTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/RegionController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/SocialMediaController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/SocialMediaTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/StatusTypeController.php
	src/Wun/Orchid/ApiBundle/Controller/Rest/TaxRateController.php
	src/Wun/Orchid/DomainModelsBundle/Entity/ContactType.php
Resolving merge bugs
Fixed incorrect column name on MemberSite mapping
Refixing config.yml
Merge branch 'develop' into lord_baine

Conflicts:
	app/AppKernel.php
	app/config/config.yml