Version bump for 1.8.5

Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Version bump for 1.8.6testing

Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Merge branch '1.8_STABLE' of github.com:MaharaProject/mahara into 1.8_STABLE