update setting git
update  web2py to 2.6.4
update web2py to 2.6.4
resolve conflict