nothing
Merge branch 'develop' into integration

* develop: (27 commits)
  Changed imports in ocr tests
  Reformatted code
  Added TODO file
  Added fs module
  Added git hooks
  Squashed '.git-hooks/' content from commit 90e94fa
  Piped all output from tesseract to /dev/null
  Added all known ocr test cases
  Added even more testcases
  Added new testcase
  Update README.md
  Added trailing slash to tesseract prefix path
  Tesseract should now find the correct command
  Removed branch parameter from readme
  Added tesseract install to travis config
  Cleaned up some code
  Simplified unicode handling
  Added fuzzywuzze and integrated ocr app
  Fixed dev setup on linux
  Removed bad django version
  ...

Conflicts:
	database.db
Merge branch 'develop' into integration

* develop:
  Replaced json with yaml, removed TODO file, removed old stuff
Merge branch 'develop' into integration

* develop:
  Added missing yaml module to requirements
added new testdata
Added first support for py.test
Merge branch 'develop' into feature/pytest

* develop:
  added new testdata
  nothing
created png fils
Changed glob to exclude yml
deleted pdf
Merge branch 'develop' into feature/pytest

* develop:
  deleted pdf
  created png fils
fixed testdata
added tiff
Removed pdfs
Added verbose switch to build.sh
Fixed some test expecations
Tests now run ocr in debug mode
Fixed yml formatting
Merge branch 'develop' into feature/pytest

* develop:
  added tiff
  fixed testdata

Conflicts:
	ocr/resources/2013-07-08-111657.pdf
Ignored failing tests, for now