Updating struxr and cleaning up sass files
Merge branch 'refs/heads/mockup' into develop