default error proc overskrevet, twitter bootstrap friendly
Merge remote-tracking branch 'origin/master'