Merge branch 'master' of github.com:HenrikBengtsson/aroma.core

Conflicts:
	.Rbuildignore
	R/AromaPlatform.R
	R/AromaPlatformInterface.R
	incl/AromaPlatform.Rex