- Many bug fixes

- Extensive re-structuring of the code
- Added support for aspect-oriented ontology development
Merge branch 'master' of https://github.com/ag-csw/OntoMaven

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.m2e.core.prefs