Merge branch 'release/0.2'
Merge branch 'develop'
Merge branch 'release/0.3'
Dont need south with django 1.7
Merge branch 'master' into develop