Working on PHP classes. Some files will be deleted after work
Working on PHP classes. Some files will be deleted after work
Merge origin/master

Conflicts:
	apps.json
	hello/config.json