Merge branch 'bootstrap3' of https://github.com/afro88/huginn into afro88-bootstrap3
Fixed timezones for scheduler
a few minor UI tweeks after the bootstrap upgrade
Merge remote-tracking branch 'origin/master' into bootstrap3-tweeks
Merge pull request #310 from mfclarke/timezone_scheduler_fix

Fixed timezones for scheduler
Merge pull request #312 from cantino/bootstrap3-tweeks

Bootstrap3 tweeks