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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	TER-2014-csharp.sln
	TER-2014.sln