translation domain fixes
something
revert night 1 on master
Merge branch 'master' of https://github.com/Shelob9/second_speaker

* 'master' of https://github.com/Shelob9/second_speaker:
  revert night 1 on master
  something
  night 1
avoid double add of style.css from parent theme
category display and other css fixes
Merge branch 'master' into sfSite_child

* master:
  avoid double add of style.css from parent theme
  revert night 1 on master
  something
  translation domain fixes

Conflicts:
	downloads.php
	inc/childFunc.php
	lib
	style.css
style.css version # and put back the @import