this one was modified from the local branch
Merge branch 'BG-betalocal'

Conflicts:
	index.php

I am going to try and merge and see what happens