Changes from tablet
Merge branch 'master' of bitbucket.org:aspirin/zombierush
Merge remote-tracking branch 'github/master'