acc test added /charge, modified req.flash
Merge branch 'dev'
users.json
Merge branch 'dev'