Restore returning README.md for directory
Improved CategoryController and CategoryService
Improved article edition
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/public/js/controllers/CategoryController.js
	src/public/js/services/CategoryService.js
Added git commit
Merge remote-tracking branch 'origin/master'