Fixing style errors in gulp file
Refactoring main app
Merge branch 'refactoring'