version 1.1
version 1.2
update to v.1.2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	R/designMatrices_aux2.R