So far
linking with gui
Merge branch 'master' of https://github.com/harrylepotter/cmshopper

Conflicts:
	JTGestureBasedTableViewDemo/ViewController.m