r

r
Merge branch 'master' of https://github.com/a4p/gh_cdev

Conflicts:
	www/cache.appcache