Burgee images
Merge branch 'master' of https://github.com/maxrahder/HooferSailing

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