some sucks
some fixed
Merge branch 'NDK'

Conflicts:
	src/cn/Ragnarok/ReliefFilter.java

	modified:   src/cn/Ragnarok/ReliefFilter.java