Task #163_1: Merge master, added css style for Firefox
Merge branch '163_1' into test