updating poms for 0.0.4-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into development
Updating develop poms back to pre merge state
updating poms for 0.0.5-SNAPSHOT development
added licence and project name
adjusted javadoc xmx settings
Merge branch 'development' of https://github.com/moskitoli/halite into development

Conflicts:
	pom.xml
updating poms for branch '0.0.5' with snapshot versions
updating poms for branch'release/0.0.5' with non-snapshot versions
Merge branch 'release/0.0.5'