Squashed commit of the following:

commit 3562fd7495af4fe0f6743292b687d796ce89929b
Author: Danny Wahl <danny@iywahl.com>
Date:   Tue May 13 09:53:53 2014 +0800

    update from BS3 project

    https://github.com/bmbrands/theme_bootstrap/