solved rebase conflict
ticket:4: rebase fix
ticket:4: added settings to context processors and added a few to the main page