Added compatibility with django versions 1.6. Fixed some minor bugs
Merge pull request #36 from guimesmo/master

Added compatibility with django versions 1.6. Fixed some minor bugs