Mucco laptop #1

nothing to do here
Mucco laptop #1b

lols removed
Merge branch 'master' into mucco
Updated laptop files from september
Merge branch 'master' of github.com:mucco/GasRepo

Conflicts:
	Gas/.classpath
	Gas/pom.xml
	Gas/target/classes/it/polito/gas/model/GasMember.class
	Gas/target/classes/it/polito/gas/model/GasMember_Roo_Configurable.class
	Gas/target/classes/it/polito/gas/model/GasMember_Roo_Jpa_ActiveRecord.class
	Gas/target/classes/it/polito/gas/model/GasMember_Roo_Jpa_Entity.class
	Gas/target/classes/it/polito/gas/web/ApplicationConversionServiceFactoryBean$ApplicationConversionServiceFactoryBean_Roo_ConversionService$3.class
	Gas/target/classes/it/polito/gas/web/ApplicationConversionServiceFactoryBean.class
	Gas/target/classes/it/polito/gas/web/ApplicationConversionServiceFactoryBean_Roo_ConversionService.class
	Gas/target/classes/it/polito/gas/web/GasMemberController.class
	Gas/target/classes/it/polito/gas/web/GasMemberController_Roo_Controller.class
	Gas/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	Gas/target/m2e-wtp/web-resources/META-INF/maven/it.polito.gas/Gas/pom.properties