from server
\Merge branch 'master' of github.com:kpx13/fitngo