doing some fixes
Merge branch 'master' of https://github.com/FullStackFoundry/fullstackfoundry.github.com