refactoring+sql
Merge remote-tracking branch 'origin/master'
refactoring+security+helper