fixed gulp bug
Merge pull request #19 from wlabranche/dev

fixed gulp bug
Merge pull request #20 from MSchip/master

Modify organization of App