merge
Translations updated
Merge branch 'master' of github.com:gridguyz/core
Merge branch 'testing' of github.com:gridguyz/core
Merge branch 'develop' of github.com:gridguyz/core
remove facebook comment from master
Merge branch 'master' into testing