replaced mockups with the real stuff
Merging with last commits
Merge pull request #11 from rubberduckdev/dev_branch

Merging latest commits with the original dev_branch