Some initial templates
Heroku preparations
Heroku settings
Fixed heroku db settings
Added cmsplugin filer to requirements
Heroku preparations
Testing heroku settings again
Merge branch 'master' of github.com:Teknologforeningen/traffpunk_aalto
Merge branch 'master' into heroku

Conflicts:
	README.md
	requirements.txt
	traffpunkt_aalto/settings.py
Reverting some settings
Heroku settings in production settings
Merge branch 'master' into heroku
Moved heroku settings to settings.py, import didn't work
Re-enable south
Updated readme