modified:   test.py
Merge branch 'master' of http://github.com/jccheng-ad/AppCore

Conflicts:
	test.py