Merge pull request #86 from candy-chat/feature/Bug_85

Change ressources to assets