Avancé Upload
Merge branch 'master' of https://github.com/infogenious/cvalk

Conflicts:
	.gitignore
	app.js
	package.json
	routes/admin.js