change some settings
shange gitignore, add media file
Merge branch 'master' into gedocorp

Conflicts:
	.gitignore
remove old css
new static for dajax and django-admin
remove all shits
add debug_toolbar
add debug_toolbar