config
Merge branch 'master' of https://github.com/createdonline/HiltonFBapp

Conflicts:
	www/config.xml