add contrib module + drupal core 7.34
Merge branch 'API' of https://github.com/haryantowang/Stock into API

Conflicts:
	sites/all/themes/custom/sock/test-page2.tpl.php