mad meeeerrrge
merge
fixing app display font sizes and truncate
Merge branch 'master' of github.com:Lextech/cdw-marketplace-ruby