Change name of sass imports to avoid create empty css files
Added changes made in custom.css in SCSS file
Merge pull request #46 from perichus/sass-clean

Sass files creates empty css files. Closes #45
Porting markup from Login-Register to Persistent Login-Register
Merge pull request #47 from perichus/persistent-login-register

Porting markup from Login-Register to Persistent Login-Register
Merge branch 'develop' of github.com:redlightblinking/b-responsive
Solved conflicts
Resolved conflicts with custom scss/css
fix merge conflicts
 directory cleanup, tweaks for CE
moved local.xml to responsive.xml so it is not overridden but custom theme added
merge fix