heroku config
Merge branch 'skoda' into heroku

Conflicts:
	requirements.txt
version to jsonfield
heroku - specifing runtime
heroku - removed debugging
Merge branch 'skoda' into heroku
heroku - enabled debuging
Merge branch 'skoda' into heroku
Merge branch 'skoda' into heroku
Merge branch 'skoda' into heroku
Merge branch 'master' into skoda
Merge branch 'skoda' into heroku

Conflicts:
	gcloudsite/settings.py
settings bug fix
Merge branch 'master' into skoda
Merge branch 'skoda' into heroku
minor
serving static files
heroku - static placeholder
removed urls static hack
Merge branch 'skoda' into heroku

Conflicts:
	gcloudsite/production.py
	gcloudsite/settings.py