reviewed code
fixed merge conflicts
Merge pull request #102 from massiveart/feature/tabs

husky tabs
build new version
fixed merge conflicts