LATESt 10-10-12
Merge branch 'master' of https://github.com/cctmag/navio

Conflicts:
	beacon testing/Navio-beacon/Navio-beacon.xcodeproj/project.pbxproj
COMMIT