Changed to force layout
Merge branch 'master' of https://github.com/jbadua/classApp