Creation de la page upload
Merge branch 'master' of https://github.com/tcoatale/Responsive

Conflicts:
	app/scripts/controllers/main.js