DeliveryActivity complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	LivrExpress/src/com/ermahgerd/livrexpress/route/RouteActivity.java
DeliveryActivity complete
DeliveryActivity complete