Merge pull request #306 from MaxCDN/develop

3.1.1
Merge pull request #309 from MaxCDN/develop

added bootstrap 3.1.1
Merge pull request #310 from MaxCDN/master

Master