fix #309
next version is targeting Sprint 38
fix discardAllChanges and unstage
todo update
some fixes for sprint 38