Load parent styles when child theme is activated
Update POT. Fixes #645.
Merge branch 'child-theme-support' of github.com:grappler/_s into grappler-child-theme-support
Merge branch 'grappler-child-theme-support'
Revert #638 for a bit.
Merge remote-tracking branch 'upstream/master' into ja

* upstream/master:
  Revert #638 for a bit.
  Update POT. Fixes #645.
  Load parent styles when child theme is activated

Conflicts:
	languages/_s.pot