Upgraded to django 1.7 - Everything went better than expected
Merge remote-tracking branch 'origin/hotfix-1.0.1' into develop
Fixed Issue #287