feature 1
feature 1.1
Merge remote-tracking branch 'origin/development' into feature-1

Conflicts:
	README
feature 1 ready
dev version 3