Can press News and History button already

- fixed a bit javadoc
Merge branch 'master' of https://github.com/Noobs-ske/mobilepos

Conflicts:
	mobilepos/mobilepos/bin/classes.dex

mobilepos/mobilepos/bin/classes/com/example/mobilepos/CatalogActivity.cl
ass

mobilepos/mobilepos/bin/classes/com/example/mobilepos/MainActivity$2.cla
ss

mobilepos/mobilepos/bin/classes/com/example/mobilepos/MainActivity.class
	mobilepos/mobilepos/bin/classes/com/example/mobilepos/R$layout.class
	mobilepos/mobilepos/bin/classes/com/example/mobilepos/R$menu.class
	mobilepos/mobilepos/bin/classes/com/example/mobilepos/R$string.class
	mobilepos/mobilepos/bin/classes/com/example/mobilepos/R$style.class

mobilepos/mobilepos/bin/classes/com/example/mobilepos/SaleActivity.class

mobilepos/mobilepos/bin/classes/com/example/mobilepos/UpdateActivity.cla
ss
	mobilepos/mobilepos/bin/mobilepos.apk
	mobilepos/mobilepos/gen/com/example/mobilepos/R.java

mobilepos/mobilepos/mobilepos/bin/res/drawable-hdpi/ic_action_search.png
	mobilepos/mobilepos/mobilepos/bin/res/drawable-hdpi/ic_launcher.png
	mobilepos/mobilepos/mobilepos/bin/res/drawable-ldpi/ic_launcher.png

mobilepos/mobilepos/mobilepos/bin/res/drawable-mdpi/ic_action_search.png
	mobilepos/mobilepos/mobilepos/bin/res/drawable-mdpi/ic_launcher.png

mobilepos/mobilepos/mobilepos/bin/res/drawable-xhdpi/ic_action_search.pn
g
	mobilepos/mobilepos/mobilepos/bin/res/drawable-xhdpi/ic_launcher.png