Merge branch gsimplecal adding x11-apps/gsimplecal