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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/metadata/0f/0f5ee73498abff645be6dfe7b3e19ba9
	Library/metadata/22/22eddb1debde7534b8c7d7c4a726ce85
	Library/metadata/69/693588b1ba5565049a560fb6971e6812
	Library/metadata/af/af4f7bbfc96b4af4094076a46909b07a
	Library/metadata/ed/ed18abb5cb165c742a9f05f8b0e7a26c
	TER-2014-csharp.sln
	TER-2014.sln