New time & date on dev machine...
Remove <br> from items#index
Merge remote-tracking branch 'origin/master'

* origin/master:
  20130720
  20130720
  20130720
  20130720
  20130720