Removed two tabs from gui not used.
Workaround until the libosmgpsmap version used in Ubuntu is fixed (debian bug #745860)
Merge branch 'master' into ubuntu