chris makes a change to dev branch
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

Conflicts:
	readme.txt