-- first commit
- merge with other version i had open
Merge branch 'master' of https://github.com/mroder/komodo

Conflicts:
	.classpath
	.gitignore
	.project
	pom.xml