börjat arbetet med order-service
Början på OrderAPI och OrderService lagren
Commit efter merge
Commit efter merge
Commit efter merge
Commit efter merge
Commit efter merge
Commit efter merge
Merge origin/develop into develop

Conflicts:
	nova-api/src/main/java/se/blinfo/nova/api/resource/ProductResource.java
	nova-domain/src/main/java/se/blinfo/nova/domain/product/impl/DefaultProduct.java
	nova-mysql/pom.xml
	nova-mysql/src/main/resources/META-INF/persistence.xml
	nova-service/pom.xml
	nova-service/src/main/java/se/blinfo/nova/service/ServiceProvider.java
	nova-service/src/main/java/se/blinfo/nova/service/importer/ProductImporter.java
	nova-service/src/main/java/se/blinfo/nova/service/properties/NovaServiceProperties.java
	nova-service/src/main/resources/novaproperties.xml