Last of the translations
Merge branch '1.0' of https://github.com/CST8218-BlogShare/TestRepo into 1.0

Conflicts:
	My First Dynamic Web Project/Lang/PostEditHistory_FR.properties
Merge branch '1.0' of https://github.com/CST8218-BlogShare/TestRepo into 1.0