fix help_text if fields are on the same row
improved selenium tests
test Modelform
Merge branch 'fix_help_text' of github.com:escaped/django-image-cropping into next
mv css rules into seperate css file
fix help_text if allow_fullsize is enabled
Merge branch 'tests' into next
cleanup and fix tests
templatetag using simple_tag
test templatetag
update selenium
Merge branch 'master' into next

Conflicts:
	tox.ini
Remove runtests script and rather use tox all along the way
Use xpath when looking for elements in selenium tests
Rather wait implicitly
Try to work around timeout issues on Travis CI
Merge branch 'tests' into tox-travis

Conflicts:
	example/requirements.txt
	example/tests/test_browser.py
Merge branch 'tox-travis' into next

Conflicts:
	example/tests/test_browser.py
	tox.ini
Fix imports
Make sure we only run the tests for our app