Merge branch 'feature/app_dev' of http://git.hiwavo.com/Fohow/fohow_api into feature/app_dev

* 'feature/app_dev' of http://git.hiwavo.com/Fohow/fohow_api: