Removing rogue php tag that somehow got in there
Merge branch 'develop'