Develop

This file still has merge markup in it (lines 542, 545, 667)  I suggest reverting the file to the one which is in github.  I don't think any changes need to be made to it.  Check to make sure that it does not work the way you expect before you then make changes to it.