solve oom
merge oom
Merge branch 'master' of github.com:hyrtyp/guokaihang

Conflicts:
	CeiPhone/bin/classes/com/hyrt/ceiphone/R$styleable.class