clean up (the branch's name is a bit misleading, sorry!)

- add TODO about using prepared statement in dbservices
- use APIs.getVersion() when setting titles
- resolve conflicts in puzzles/GDD.java