fix for issue #166
Merge branch 'master' of github.com:netdna/bootstrap-cdn
updated Amelia bootswatch theme #168
Merge branch 'issue-168'
Merge branch 'master' into feature/stats