Twitter bootstrap3 upgrade preperration
Merge branch 'master' into bootstrap3
Major UI overhaul with update to Twitter bootstrap 3