Update to bootstrap 3.3
Merge pull request #216 from sharoonthomas/develop

Update to bootstrap 3.3