Controller skeletons moved to gui bundle
Merge remote-tracking branch 'origin/master'