xxx
Merge branch 'master' of github.com:jasonknight/woocommerce-json-api

Conflicts:
	debug.log
possible fix for peeps being logged in