Ignore static
Merge remote-tracking branch 'origin/master' into django-1.6

Conflicts:
	.gitignore