Merge branch 'master' into gitHubMaster

Conflicts:
	BidsDay/.pom.xml
Merge branch 'master' of https://github.com/jayguidos/bids-jbpm into gitHubMaster

Conflicts:
	BidsDay/.pom.xml
Merge remote-tracking branch 'remotes/gitHub/master' into gitHubMaster
[TRIVIAL] Merge of Andi's stuff