merge from lp:~tim-ingham/openpetraorg/dev_14_11_26

https://tracker.openpetra.org/view.php?id=3448
https://tracker.openpetra.org/view.php?id=3671
https://tracker.openpetra.org/view.php?id=3665
https://tracker.openpetra.org/view.php?id=1174
https://tracker.openpetra.org/view.php?id=3445