small changes
.
Merge branch 'master' of https://github.com/di2e/openstorefront

Conflicts:
	client/openstorefront/app/index.html
Merge branch 'master' of https://github.com/di2e/openstorefront
index angular-touch / loading-bar
commit all
Merge branch 'master' of https://github.com/di2e/openstorefront
Merge branch 'master' of https://github.com/di2e/openstorefront
search service
Merge branch 'master' of https://github.com/di2e/openstorefront
index changes
commit changed pull down.
Merge branch 'master' of https://github.com/di2e/openstorefront
solr changes
solr changes and rebuild
changes to solr search to get full componentsearchview data
Various conflicts resolved
Merge branch 'master' of https://github.com/gebagley/openstorefront into gebagley-master

Conflicts:
	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
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/ErrorTicketWrapper.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/RestListResponse.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/model/UserTrackingWrapper.java
	server/openstorefront/openstorefront-web/src/main/java/edu/usu/sdl/openstorefront/web/rest/service/Search.java
Merge branch 'gebagley-master'
Merge pull request #318 from Jedwondle/master

Greg's commits added.