Fix activity animation conflicts with window tranluct
Merge branch 'master' into develop
Fix proguard
Merge branch 'master' into develop

Conflicts:
	app/proguard-project.txt
Merge branch 'master' into develop, fix proguard

Conflicts:
	app/proguard-project.txt
add swipeback lib