Ignoring
Merge branch 'master' of github.com:netrebel/jbpm

Conflicts:
	.gitignore