Replacing bootstrap with Twitter bootstrap. Adding edit icon
Merge remote-tracking branch 'origin/master'