プログレスバーを実装
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	res/layout/activity_main.xml
	src/net/sourceforge/opencamera/MainActivity.java