format servlets
allow git to track .sql files
Merge remote-tracking branch 'origin/master'