Modified css structure
Moved data to separate folder
Merge branch 'dev'