eee
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/kp/com/reader/MainActivity.class