removed local changes with exception of compass gened css
removed line comments and sass cache files, ignored my local config.rb's and my .gitignore
Merge branch 'feature/rollback-local-changes' into develop

* feature/rollback-local-changes:
  removed line comments and sass cache files, ignored my local config.rb's and my .gitignore
  removed local changes with exception of compass gened css
Merge branch 'hotfix/1.0.5' into develop

* hotfix/1.0.5:
  removed local path ref
Merge branch 'release/1.0.4'

* release/1.0.4:
  removed line comments and sass cache files, ignored my local config.rb's and my .gitignore
  removed local changes with exception of compass gened css