Merged in develop (pull request #1)

merge django 1.6
Merge pull request #6 from mwolff44/master

Merged in develop (pull request #1)
Merge pull request #7 from mwolff44/feature/switch-ESL

Feature/switch esl
Merge pull request #8 from mwolff44/develop

Merge branch 'feature/switch-ESL' into develop
Merge pull request #9 from mwolff44/feature/New_interface

Feature/new interface
Merge pull request #10 from mwolff44/django1.6

Merge pull request #6 from mwolff44/master
Merge branch 'release/1.23'
Correct travis conf file
Merge branch 'hotfix/Travis_conf' into develop