Merge remote-tracking branch 'origin/master'

Conflicts:
	realmemory/bin/realmemory.apk
	realmemory/bin/resources.ap_

Signed-off-by: cray0114 <cray0114@gmail.com>
Merge remote-tracking branch 'origin/master'


Signed-off-by: cray0114 <cray0114@gmail.com>