fix
Merge branch 'master' of https://github.com/Kraks/Apus

Conflicts:
	analyse.py
fix
Merge branch 'master' of https://github.com/Kraks/Apus
add subscribe gift