Merge pull request #31 from JetAlone/develop-app

Develop app
Merge pull request #33 from JetAlone/develop-app

Develop app
Merge remote-tracking branch 'origin/develop' into deevelop-dashboard