Cleaning up, adding text shadow
Merge branch 'develop'