Stacked and merged.stack updated, version bump to 1.2.0
merge conflicts

Merge branch 'master' into devel

Conflicts:
	DESCRIPTION
	R/splitstackshape-package.R
	README.md