update
updates
conflicts fix
update
update
Merge pull request #1 from etelej/chieftheme

Chieftheme updates