Merge pull request #295 from dshurt/master

Master
Final commit for the API/client interactions before the September drop off date for IOC.
Merge pull request #296 from Jedwondle/master

Final commit for the API/client interactions before the September drop off date for IOC.
Merge branch 'master' of https://github.com/di2e/openstorefront