Merge branch 'master' into Travis-Branch
Form Submit partially working
Merge branch 'Travis-Branch'
James bad database
Merge branch 'Travis-Branch'
Merge remote-tracking branch 'origin/master' into annes_branch