Core polishing, Glow test implement
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	res/drawable-nodpi/atlas.png