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
Merge pull request #313 from Jedwondle/master

Fixed the issues with Questions and Responses.
Updates to scripts.
Merge pull request #314 from blaine-O/master

Updates to scripts.
Added test and added filtering to get trackings
Merge pull request #315 from dshurt/master

Added test and added filtering to get trackings