1.7, Added Localization support, and merged with master

Added localization support to SubBlock and MetaBlock,
Merged with master to include fixes.