Revert "Version 1.1"

This reverts commit 0704e12f9ba9c28475cd3c1447d3e70ee33ef85f.

Conflicts:
	TestProj/TestProj.cpp
1.5
Merge remote-tracking branch 'origin/Branch-Two'