php files
php code
Merge branch 'master' of https://github.com/jaewook77/oracle-ibeacon-hackathon-och2

Conflicts:
	samples/phonegap-helloworld/helloworld/www/index.html