Merge branch 'master' of https://github.com/GalOshri/Assassins

Conflicts:
iOS/Assassins/AssassinsService.h