merge Snap!Cloud and GitHub; fix some bugs