update to self-closing tag syntactic sugar
make the "active" control state more obvious
Merge remote-tracking branch 'origin/master'

* origin/master:
  remove assets dir