emotions change log
Merge branch 'master' of https://github.com/Arn-O/kuk-A-droid

merge clean and local dev