Merge branch 'feature/rappdirs'

* feature/rappdirs:
  Change data store to rappdirs directory

Conflicts:
	DESCRIPTION (packages added in each branch)