module.exports = function(grunt) {
	grunt.initConfig({
		pkg: grunt.file.readJSON('package.json'),
		concat: {
			// options: {
			// 	separator: ";"
			// },
			css: {
				src: ['css/*.css', '!css/style.css'],
				dest: 'dist/css/vendor.css'
			}
		},
		copy: {
			css: {
				src: ['css/style.css'],
				dest: 'dist/css/style.css'
			},
			images: {
				src: ['images/logos/*.jpg', 'images/icons/*.png', 'images/icons/*.jpg', 'images/lib/*.*'],
				dest: 'dist/'
			},
			// data: {
			// 	src: ['data/expeditions.json', 'data/expeditions-geometries.json'],
			// 	dest: 'dist/'
			// },
			deploy: {
				src: ['data/**/*'],
				dest: 'dist/'
			}
			
		},
		uglify: {
			options: {
			},
			dest: {
				files: {
					'dist/js/index.js': ['dist/js/index.js']
				}
			}
		},
		cssmin: {
			vendor: {
				src: 'dist/css/vendor.css',
				dest: 'dist/css/vendor.css'
			},
			style: {
				src: 'dist/css/style.css',
				dest: 'dist/css/style.css'	
			}
		},
		jshint: {
			files: ['gruntfile.js', 'js/*.js'],
			options: {
				globals: {
					jQuery: true,
					console: true,
					module: true
				}
			}
		},
		browserify: {
			all: {
				files: {
					'dist/js/index.js': ['js/app.js']					
				}
			},
			options: {
				watch: true
			}
		},
		watch: {
			scripts: {
				files: ['<%= jshint.files %>'],
				tasks: ['jshint']
			},
			css: {
				files: ['css/style.css'],
				tasks: ['copy']
			},
			deployed: {
				files: ['dist/css/style.css'],
				options: {
					livereload: true
				}
			}
		}
	});

	grunt.loadNpmTasks('grunt-contrib-uglify');
	grunt.loadNpmTasks('grunt-contrib-jshint');
	// grunt.loadNpmTasks('grunt-contrib-qunit');
	grunt.loadNpmTasks('grunt-contrib-watch');
	grunt.loadNpmTasks('grunt-contrib-concat');
	grunt.loadNpmTasks('grunt-contrib-copy');
	grunt.loadNpmTasks('grunt-browserify');
	grunt.loadNpmTasks('grunt-css');
	grunt.registerTask('test', ['jshint']);


	//grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'watch']);
	grunt.registerTask('default', ['browserify', 'concat', 'copy:css', 'copy:images', 'watch']);
	grunt.registerTask('minify', ['browserify', 'uglify', 'concat', 'copy:dev', 'cssmin']);
	// grunt.registerTask('copy-data', ['copy:deploy']);

};
@@ -606,24 +606,27 @@
 %09%09// %7D,%0D%0A%09%09%09
+// 
 deploy: %7B%0D%0A%09
@@ -619,32 +619,35 @@
 / deploy: %7B%0D%0A%09%09%09
+// 
 %09src: %5B'data/**/
@@ -647,32 +647,35 @@
 ata/**/*'%5D,%0D%0A%09%09%09
+// 
 %09dest: 'dist/'%0D%0A
@@ -673,24 +673,27 @@
 'dist/'%0D%0A%09%09%09
+// 
 %7D%0D%0A%09%09%09%0D%0A%09%09%7D,
@@ -2243,12 +2243,8 @@
 copy
-:dev
 ', '

fix gruntfile