Merge pull request #3 from entermedia-community/dev

merging bootstrap into Dev
Revert "Dev"
Merge pull request #5 from entermedia-community/revert-3-dev

Revert "Dev"
Fixing weird branching