[lipstick] add connection selector
Merge branch 'master' of github.com:lpotter/lipstick

Conflicts:
	src/connectionselector.h