master d

master d
dev e

dev e
Merge branch 'dev' into master

Merge branch 'dev' into master
Conflicts:
	gitRevert.rtf