Merge branch 'develop-theme' into hotfix
Merge remote-tracking branch 'origin/tmgmt-retranslation' into hotfix
updated drupal from 7.31 to 7.32
Merge branch 'hotfix' into sprint-4