close #36 issue
Merge branch 'dev' of https://github.com/TouchTheBeat/Backend into dev