updated HISTORY
Merge branch 'master' into xbeeZB