network detect
Merge branch 'develop' into UIdevelop

Conflicts:
	app/app.iml
drawable test
fragment fix
adapter test
Merge branch 'develop' into UIdevelop
Merge branch 'UIdevelop' of https://github.com/KFCBETA/chikan into UIdevelop
adapter set
text change
fullscreen test
UI fix
add pic store db method