7.10
Merge branch 'master' of https://github.com/approwess/pgApp3

Conflicts:
	AppSample/assets/www1/www/index.html
	onsenuifinal/www/php/test.php