modify
Merge branch 'master' of https://github.com/crossdavidfu/Petros

Conflicts:
	Petros/src/com/petroschurch/petros/lib/CommonPara.java