Merge branch 'master' of https://github.com/swarage/612-2013 into swarage-master

Conflicts:
	launcher.cpp
	ports.h
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	launcher.cpp
	ports.h