Fixed availability error and json conflicts
Merge branch 'master' of https://github.com/mofus/GSE