dev
Merge branch 'master' into dev

Conflicts:
	test.txt
Merge pull request #1 from jbouchard/dev

dev