Merge pull request #326 from dshurt/master

Master
Added the 'add' functions for solr.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #327 from Jedwondle/master

Added the 'add' functions for solr.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #328 from Jedwondle/master

Merge branch 'master' of https://github.com/di2e/openstorefront
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #329 from Jedwondle/master

Trying to merge into Master.
Adding some sleeps back in for stability, the timeouts on the functions don't always get the job done.
After running the scripts many times, had to add some more delay to make sure it is consistently giving valid results.
Merge pull request #330 from blaine-O/master

Consistency- added a few more delays so it always returns valid results
certain change with Solr
get up to date
Fixed a few things for correct java here.
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/resources/openstorefront.properties
Merge pull request #331 from Jedwondle/master

Fixed a few things for correct java here.
Fixed an issue with the filters, and also fixed the long username issue.
Attempt at fixing IE 9 'goToFullPage()' function.
Merge pull request #332 from Jedwondle/master

Fixed an issue with the filters, and also fixed the long username issue.
solr model change