update
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/metadata/c7/c7de5b9bbf95df24185e1807e650463c
	TER-2014-csharp.sln
	TER-2014.sln