Remove logging
Merge branch 'master' of github.com:pangea/xcore
Add localStorage source
Fixed merge conflicts