Merge branch 'pol' of https://github.com/carlosep93/PROP_CAMIONS into josep

Conflicts:
	camio/src/camio/Cjt_Elements.java
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
tour
Merge branch 'master' of https://github.com/carlosep93/PROP_CAMIONS into josep
2
 a
Merge branch 'pol'
tour sense acabar
Merge branch 'josep'
Merge branch 'joan'
polet
Merge branch 'pol'
CjtElements que abans era tour molt acabadota ja
Merge branch 'josep'
suprimerixo Tour pq es diu CjtElements
class CtrlDades + part de CtrlDomini
Merge branch 'pol'
driverclass_ctrlDades