commit for develop merge
Merge pull request #6 from PatrickSeet/develop

Develop
commit to merge
Merge branch 'master' of https://github.com/PatrickSeet/battlefit_proj into api_related
commit for merge
fixed merge issue from develop
added register logic
pull from develop
fixed merge issues with develop
Merge pull request #14 from PatrickSeet/api_related

Api related
fix conflict to merge to dev