local
local
Merge branch 'master' of https://github.com/gazeing/rebBackUp

Conflicts:
	CordovaLib/.classpath
	assets/www/ConfigurationSettings.xml
	project.properties