test
Merge branch 'develop'

Conflicts:
	README.md
update colors&header
Merge branch 'temp-local' into next-castle-cross-promo
add cross-logo & gradient
Merge branch 'next-castle-cross-promo' into develop