Merge branch 'master' into 11/2/13
Added Changes to Item.html
Merge branch '11/2/13' into steven