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
tour sense acabar
Merge branch 'josep'