popular mapping
Merge branch 'master' of https://github.com/kevhui/Android-ShoppingApp

Conflicts:
	src/com/juan/shopping/DisplayHistory.java