test
test
Merge branch 'master' of https://github.com/mnip91/mape-component-controllers

Conflicts:
	src/Examples/cl/niclabs/autonomic/examples/balancer/Test2.java
merge
Merge branch 'master' of https://github.com/mnip91/mape-component-controllers
Merge branch 'master' of https://github.com/mnip91/mape-component-controllers
Merge branch 'master' of https://github.com/mnip91/mape-component-controllers
test