Merge pull request #493 from dshurt/v1.2

STORE-287	Resource Links Adjustment
STORE-294	Component Version fix