Solving conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	Yacht/AndroidManifest.xml
	Yacht/src/com/example/yacht/ConnectActivity.java