テスト
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/solitonradar/MainActivity.class