Updated composer
Merge branch 'security' into develop
Merge branch 'develop' into security
Added first version of authentication provider. doesn't work yet.
Security work in progress
User provider wip.
added createShipmentRequest
added ShipmentController createShipment action and its associated routing. also made ShipmentController a service
updated sql tables
regenerated database entities
First version of security up and running. Currently passwords aren't being encoded.
Merge branch 'security' into develop
Merge branch 'develop' of ssh://192.168.2.18/home/captain/CaptainCourier/captain-courier into develop

Conflicts:
	src/Symfony/composer.lock
	src/Symfony/src/CaptainCourier/CaptainBundle/Entity/Normality/Item.php
	src/Symfony/src/CaptainCourier/CaptainBundle/Entity/Normality/Parcel.php
	src/Symfony/src/CaptainCourier/CaptainBundle/Entity/Normality/Shipment.php
	src/Symfony/src/CaptainCourier/CaptainBundle/Repository/Normality/Shipment.php
	src/Symfony/src/CaptainCourier/CaptainBundle/Resources/config/services.yml
added cidr service to container and made shipmentController dependenant on it
replaced ids with the ones that will be generated by testdata.sql
fixed merge syntax
updated composer
regenerated database classes
updated composer
fixed bug in Shipment.sql