Vertical Scroll for TextView in History activity
fix for missing AndroidManifest.xml
Merge branch 'master' of https://github.com/hirokuni/workspace_calc

Conflicts:
	Calculator/bin/AndroidManifest.xml
	Calculator/bin/Calculator.apk
	Calculator/src/com/kawasaki/calculator/History.java