test

test
Merge branch 'master' of https://github.com/goualav/Chickita

Conflicts:
	Chickita/Library/CurrentLayout.dwlt
	Chickita/Library/assetDatabase3