#3 performances archives list
Ignores and requirements
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/kolomyyaportal/portal into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into django-1.6

Conflicts:
	.gitignore
	requirements.txt