Merge branch 'master' into develop

Conflicts:
style.css
Changed theme credits
Changed theme name
Updated readme