fix merge issues
Merge branch 'master' of github.com:watinha/addon-sdk