Storage plugin archetype for Abiquo 2.6
Upgraded to latest version of maven-archetype plugin
next snapshot version
Merge branch '2.6'

Conflicts:
	pom.xml
	storage-plugin/pom.xml
	storage-plugin/src/main/resources/archetype-resources/pom.xml