merge develop with master

are we at a stage where we want to rollout develop to master ie rollout our changes to live?

I think develop is only ahead of master with respect to the test tearDown() changes and the test user accounts.