remove idea
static site
Merge branch 'master' of heroku.com:achbar

Conflicts:
	admin/index.js
	app.js
	dust/helpers.js
	models/config.js
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/node_modules/bytes/package.json
	node_modules/express/node_modules/connect/node_modules/formidable/package.json
	node_modules/express/node_modules/connect/node_modules/pause/package.json
	node_modules/express/node_modules/connect/node_modules/qs/package.json
	node_modules/express/node_modules/connect/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/mkdirp/package.json
	routes.js
	tools/db-local-dump.bat
	tools/db-local-restore.bat
	views/index.html
	views/templates/tabs.html