Merged Michael's upgrading_bootstrap

Squashed commit of the following:

commit b633c226809f57bf132d1cbd5bb52a5859e8b622
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Thu Oct 31 09:29:18 2013 +0100

    upgrade bootstrap to v3.0 and font-awesome to v4.0.3