hopefully settings.py is fixed
register functionality added
Merge branch 'master' into heroku
updated sample data file again
Merge branch 'master' into heroku