adds django 1.4.14 as requirement
Merge branch 'master' into develop
adds django 1.4.14 as requirement