Merge remote-tracking branch 'sasikumardr/master'

* sasikumardr/master:
  Alphabetically sort imports to comply with style guide
  Additional fix for #1269. Also mapping /dist/dev/css/ to /css/ in index.html