plumb rsDisc through rather than relying on extern
Merge branch 'master' of github.com:chozabu/FriendMap
remove images qrc file