updated the app code
Merge branch 'master' of https://github.com/bestmust/erx

Conflicts:
	app/Erx/src/com/erxproject/erx/library/UserFunctions.java