prepare for big update
Merge branch 'master' of https://github.com/tatocaster/friendzone-client