added discovery page
Merge branch 'master' of https://github.com/ecocache/ecocache

Conflicts:
	phonegap/eco-cache/www/index.html
Merge branch 'master' of https://github.com/ecocache/ecocache
Merge branch 'master' of https://github.com/ecocache/ecocache
tidy up database patches
updated propertyView