Merge branch 'develop' into asyncio

# Conflicts:
#	pyrogram/client/types/bots/callback_query.py

pyrogram/client/types/bots/callback_query.py

@@ -79,7 +79,7 @@ class CallbackQuery(PyrogramType, Update):
         self.chat_instance = chat_instance
         self.message = message
         self.inline_message_id = inline_message_id
-        self.data: str = str(data, "utf-8")
+        self.data = str(data, "utf-8")
         self.game_short_name = game_short_name
 
     @staticmethod

pyrogram/client/types/bots/inline_keyboard_button.py

@@ -17,6 +17,8 @@
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 from typing import Union
 
+from typing import Union
+
 from pyrogram.api.types import (
     KeyboardButtonUrl, KeyboardButtonCallback,
     KeyboardButtonSwitchInline, KeyboardButtonGame