fixing conflicts
added js function populateSkuHistory
added properties to entity form that corresponded to the form attribute dropdown.
Merge branch 'master' into clean_master

Conflicts:
	module/Search/view/search/form/index.phtml
Bug fixes after merge