fix bug render twice
Merge branch 'master' of local:/data/www/zyy

Conflicts:
	framework/3rd/hiredis/build/Release/.deps/Release/hiredis.a.d
	framework/3rd/redis/examples/incr.js
reset version-control
del unused file
Merge branch 'master' of local:/data/www/zyy
test
fix bug app.FILES(name)