ticket:4: added test_settings_in_context
ticket:4: added settings to context processors and added a few to the main page
stash merge fix
master merge fix
added jquery datepicker code, images and css
merge fixes
t:6: admin fix