fixing compilation errors.
fixing api changes
Merge branch 'manager-website'

Conflicts:
	cloudify-widget-pool-manager-website/src/main/resources/context.xml
	cloudify-widget-pool-manager-website/src/test/java/cloudify/widget/website/MySqlOperationsTest.java
	cloudify-widget-pool-manager/src/main/resources/pool-manager-app-context.xml
	cloudify-widget-pool-manager/src/test/java/cloudify/widget/pool/manager/TestPoolManager.java
integrated REST and manager modules.