Merge branch 'master' into feature_httpcomunication
[WIP] OverLay
[WIP] GPS added
Merge branch 'master' into feature_httpcomunication

Conflicts:
	client/EyeCatch/src/io/github/oho_sugu/eyecatch/EyeCatchActivity.java