commit on leckie
Merge branch 'leckie' into dev

Conflicts:
	readme.txt