made the last line of dev branch thisfile a comment.
Merge branch 'dev'

Conflicts:
	thisfile