improve gulpfile watch
ignore folders for forever
Merge branch 'develop' of https://github.com/bitonic-team/bitonic into develop
fix server route
fix conflicts
fix server.js route