Changes before merging the theme changes
Merge branch 'master' of https://github.com/amitavroy/pgajdrupal