Added safty check for callability of as_text() method
Merge branch 'master' into add-callable
Merge pull request #226 from jrief/add-callable

Add callable
Set order to status COMPLETED if payment was received and marked manually in the backend
British English should be deprecated in software development
Merge branch 'master' of https://github.com/divio/django-shop into accept-payment-on-backend
Merge pull request #227 from jrief/accept-payment-on-backend

Accept payment on backend
Merge pull request #228 from jrief/travis-ci

Add support for Travis Continuos Integration
Added travis-ci build status to README
Merge branch 'master' of https://github.com/divio/django-shop into travis-ci