Merge pull request #358 from dshurt/master

Master
solr changes
Merge branch 'master' of https://github.com/di2e/openstorefront
Got the required changes for the review to work.

Still haven't figured out how to handle the IE 9 issue of opening a component full page.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #359 from Jedwondle/master

Got the required changes for the review to work.
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #360 from Jedwondle/master

Merge branch 'master' of https://github.com/di2e/openstorefront
Attempt to fix IE 9 open window issue.
Merge pull request #361 from Jedwondle/master

Fixed the IE 9 open window issue.
final solr changes
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge pull request #362 from gebagley/master

Some final Solr changes
Added the last few hooks for solr and moved the client over to solr search.
Merge pull request #363 from Jedwondle/master

Added the last few hooks for solr and moved the client over to solr search.
The small client side changes required to get solr to work.
Merge pull request #364 from Jedwondle/master

The small client side changes required to get solr to work.
More container tests.
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/AttributeServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SearchServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SearchService.java
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/AttributeServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/SearchServiceImpl.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/service/api/SearchService.java