add header
merge

Merge branch 'master' of github.com:sparkplug/rapidsms-generic