updated bootstrap to 3.1.1
Update app.js
Merge pull request #305 from MaxCDN/master

Master
Merge pull request #306 from MaxCDN/develop

3.1.1