set up awesome design
Merge branch 'm-gamma' into s-gamma
Changed test class to make gamma controllers