Sync
Merge branch 'master' of https://github.com/InePetrine/Subsea-git

Conflicts:
	Subsea/bin/Subsea.apk
	Subsea/bin/resources.ap_