bug-fixing; *** 0.2.3
Merge branch 'master' of https://github.com/yabeshan/AppLocator

Conflicts:
	www/config.xml
	www/js/view/SettingsPage.js