popping stash
Merge branch 'develop' into illWork

Conflicts:
	wasp-core/src/main/java/edu/yu/einstein/wasp/grid/work/SgeWorkService.java
added correct use-bases-mask for bcl2fastq step
added init scripts