Fixing
merging gatan into dev + fixing
gulp build results