Merge branch 'develop' of github.com:gregorynicholas/flask-telegram into develop-merge

Conflicts:
	flask_telegram.py
Merge branch 'develop'