Merge branch 'dev'

Conflicts:
	readme.txt