Changes for django1.6 and cms 3.0