Merge pull request #1 from Frontify/master

Get changes from original repo
view paths corrected and .htaccess added
Merge pull request #2 from frankvollenweider/master

Changes from 2014-03-03