Merge of dev with master

Reorganization of application structure
And a shift to SASS(!)