add shop
Merge branch 'master' of github.com:CaptainPlanetX/CaptainPlanet

Conflicts:
	src/com/skplanet/ListActivity.java