merging with nicolai
Merge branch 'master' of https://github.com/qimmer/mta13341

Conflicts:
	Unity_Project/Library/CurrentLayout.dwlt
	Unity_Project/Library/expandedItems