Task #163: Fixed css style for button cancel
Merge branch '163' into dev