empty
config mongos redis
generate api sails
connect-redis dependencie
link api and angularservice
dev category - a finir
dev
dev-
soir
upload image
resolve conflict
Merge branch 'api_article' into image

Conflicts:
	assets/js/app.js
	assets/js/controllers/articlescategoryController.js
	assets/templates/articlescategory.html
	assets/templates/editarticlescategory.html
	package.json
	views/layout.ejs
Merge branch 'api_article' into image

Conflicts:
	assets/js/app.js
	assets/js/controllers/articlescategoryController.js
	assets/templates/articlescategory.html
	assets/templates/editarticlescategory.html
	package.json
	views/layout.ejs
merge style
store in db
task
configService
delete front
ignore configService
fixe clientsroute