총 가격 표시 및 caching
Merge branch 'master' of https://github.com/Cocktailor/android.git

Conflicts:
	CockTailor/AndroidManifest.xml
	CockTailor/bin/AndroidManifest.xml