Hotfix for security updates SA-CONTRIB-2014-001 and PSA-2014-001, fixes #AW-1400
Merge branch 'sa_contrib_2014001' of ssh://github.com/parliamentwatch/parliamentwatch into sa_contrib_2014001