Created VirtualServerStatus enum
Merge branch 'master' of https://github.com/n3phele/core
Fixed VirtualServerStatus and moved classes to different packages to generate jar
Added missing libs
Moved classes to generate jar and added parameters for costs measure
Added atributes to Cloud.class to measure costs
Adding VirtualServerStatus again
Aaand VirtualServerStatus pushed
Added costmaps to cloud and tests related to it
Removed Linux pricing
Fixed VM Creation
Associated account to cloudProcess
Merge remote-tracking branch 'remotes/origin/costMapsWrong'

Conflicts:
	n3phele/src/n3phele/service/model/Cloud.java
	n3phele/src/n3phele/service/model/CloudProcess.java
	n3phele/src/n3phele/service/model/core/VirtualServer.java
	n3phele/src/n3phele/service/model/core/VirtualServerStatus.java
	n3phele/test/n3phele/CloudWebServiceTest.java
	n3phele/test/n3phele/NovaFactoryTest.java
	n3phele/war/WEB-INF/classes/n3phele/service/model/core/ParameterType.class
Merge branch 'master' of https://github.com/n3phele/core