merge from lp:~alan-paterson/openpetraorg/2014_11_20_bugs

https://tracker.openpetra.org/view.php?id=3655
https://tracker.openpetra.org/view.php?id=3656
https://tracker.openpetra.org/view.php?id=3628
https://tracker.openpetra.org/view.php?id=3627
https://tracker.openpetra.org/view.php?id=1959
https://tracker.openpetra.org/view.php?id=3669
https://tracker.openpetra.org/view.php?id=3644
https://tracker.openpetra.org/view.php?id=2863
https://tracker.openpetra.org/view.php?id=3059