Add compressor & oscar template dir to default.py
Added a clause around the DATABASE_ROUTERS section of app disabling as DATA_ROUTERS may not be defined.

Conflicts:
	www/settings.py
Merge branch 'pr/10'

Conflicts:
	www/conf/default.py