committing files to temp branch
fixed route for skus. not sure why i had to add all of these other files. apparently they were in .gitignore so just added them. they can be removed if need be. I don't suspect it will affect anything.
fixed merge conflicts.
Common Module:
Removed deprecated view files

Search Module:
Added to update statement for userID on attributeUpdate
now using zend Session container

Api Module:
Updated view for API Dashboard
Updated table to show Changed by

Authenticate Module:
Updated Session Storage to include Userid for Form submissions
Merge remote-tracking branch 'origin/master'
test commit
resolved conflicts with .gitignore file.
Created Route for Brands
Added load brands action to controller
Added properties to Form Entity
Added query to Form Table for Brands
Added dropdown for brands
Created Ajax request for brands to populate all brands for any given sku
added meta description wysiwyg
changed searchTerms to MetaKeywords
Merge branch 'form_attributes'

Conflicts:
	module/Search/view/search/form/index.phtml
Added content reviewed
Added orginal content
Updated sort of brand and manufacturer
Deleted duplicate brands and manufacturer options from DB
Removed deprocated entity compare
Fixed get mailinrebate
Started creating entity