Implement rough editing
Merge branch 'feature/angular-frontend' of github.com:campino2k/leDashboard into feature/angular-frontend

Conflicts:
	src/js/controllers/FeedController.js