updated README
settings fix
replaced browser column with uri column on firstrequests.html
ticket:3: tests fix, saving favicon request fix
solved rebase conflict
ticket:4: rebase fix
ticket:4: added settings to context processors and added a few to the main page
ticket:4: merge fix