Tuesday 12:50
Merge branch 'master' of https://github.com/maxrahder/HooferSailing

Conflicts:
	workspace/HooferSailingMobile/app/view/Boats.js