Update gitignore
Merge branch 'develop'
Fixed typo
Merge branch 'develop'
Merge branch 'master' of github.com:onlinecity/cpp-smpp

Conflicts:
	ext/README.md
Lint