#256 zmiany dla bootstrap tab-navs
Merge remote-tracking branch 'origin/dev' into dev