Modified algorithm for extracting context to be more robust.  Added multiple tests for testing context extraction.
Merge remote-tracking branch 'origin/g11n-contexts' into g11n-contexts

Conflicts:
	g11n/catalog/adapter/Code.php