Add export to XLSX for CPM 2014
Fix template
update requirement to get working application
Add API
Merge branch 'master' of https://github.com/kinaklub/filmfest.by
new rules for cpm2014 - md from google doc
final editing of ru version of rules
merge conflict
Merge pull request #1 from kinaklub/newrules2014

Newrules2014
Add django rest framework to dependencies
fix dates in letters templates
add belarussian rules for cpm2014
update english rules for cpm2014
Merge branch 'master' of github.com:kinaklub/filmfest.by

Conflicts:
	requirements
change rule to work with page in progress
add comment for block separation
cpm2013 seamless changes
2013 results temp changes
add winners and jury section
Merge branch '2013_index_page' of https://github.com/kinaklub/filmfest.by into 2013_index_page

Conflicts:
	filmfest/apps/cpm2012/templates/cpm2013/index.html
	filmfest/apps/cpm2013/static/cpm2013/styles.css