Merge branch 'master' of https://github.com/gecko655/earthquake.git
Formatted
Merge branch 'test'

Conflicts:
	src/jp/gecko655/earthquake/MainActivity.java
	src/jp/gecko655/earthquake/TwitterUtil.java