Merge branch 'master' of https://github.com/wearesmile/Lemonade

Conflicts:
style/css/style.css
Conflicting Style