Merge pull request #6 from ALouis38/master

update history
Merge branch 'master' of github.com:purplefish32/tree-proto-angular
Undo / Redo
Stuff
Plein de trucs
Adding favorite
Icon
Merge remote-tracking branch 'ALouis38/fav'

Conflicts:
	app/partials/tree-item.html
Bug favorite