Update TODO.txt
Update .gitignore
Merge branch 'dev'
Add fabfile

To deploy changes, just run `fab deploy` locally.
Add open graph tags for screenings
Add more open graph tags for movie club screenings
Fix og:type for screenings
Add favicon on movieclub site
Merge pull request #3 from eurecombde/fabric

Add fabfile
Add margin-top for screening headers
Merge branch 'dev'

Conflicts:
	bde_eurecom/apps/housing/TODO.txt
Change django language to english
Set blog post author to current user
Remove use of simplejson

Deprecated from django.
Add some help_text for the movieclub models
Add travis config
Add travis badge to readme
Merge pull request #5 from eurecombde/travis

Run tests on Travis
Merge pull request #4 from eurecombde/deprecation-warnings

Remove use of simplejson
prepone screening time