Merge pull request #325 from AppScale/uiUpdate

Updated AppScale UI
Merge pull request #326 from AppScale/uiUpdate

Bootstrap.js edit
Merge remote-tracking branch 'org/testing'
Merge branch 'master' into open-firewall-for-xmpp