Merge pull request #11 from waratek/develop

Merge develop branch changes to master.
Delete unused javascript
Upgrade to bootstrap v3.3.1
Merge pull request #13 from prateepb/bootstrap

Upgrade to bootstrap v3.3.1