Unfinished feature
Merge branch 'development'

Conflicts:
	text.txt