Card Manager + Merged conflict
Merge branch 'master' of https://github.com/RoOoBerT/awar-client.git