Build 2.5.2
Ignores
Merge branch 'master' into release
Build 2.6.0
Merge branch 'master' into release
Build 2.6.0
Changed the default for add chromosomal coordinates to no.
Bugs in norm-affy-gene fixed to allow bioMart annotation
Fix htseq-count_chr link for 2.6.0
Fix htseq-count_chr in 2.5.2 update-exec.sh
Merge branch 'release'
Merge branch 'master' of https://github.com/chipster/chipster.git
Merge branch 'master' into data_beta

Conflicts:
	src/main/resources/build.number
	src/main/resources/version.number