updating
Merge branch 'gh-pages' of github.com:bitblu/portal into gh-pages