Updating automatically? Testing anyways.
Merge branch 'master' of https://github.com/Paroni/Narcissos.git

Conflicts:
	Narcissos/Library/CurrentLayout.dwlt
	Narcissos/Library/CurrentMaximizeLayout.dwlt
	Narcissos/Library/assetDatabase3