removing LICENSE file
handling merge conflicts

Merge remote-tracking branch 'origin/develop' into theme2014

Conflicts:
	.Rbuildignore
	DESCRIPTION