created detailview
Merge branch 'master' into CreateAndroidApp
refactor view
Merge branch 'CreateAndroidApp'
Merge master to staging for version team city build 1.0.170