Add some alternate forms in enums

Should fix issue #920
Fix moves in enums.h
Fix moves in proxydatacontainer.h
Sub fix
Merge pull request #936 from turbedi/patch-3

Fix moves in proxydatacontainer.h
Merge pull request #937 from Withoutatrace/substitute

Sub fix
Merge pull request #934 from turbedi/patch-1

Add some alternate forms in enums
Fix Moonblast in moves.cpp
Fix move animation - Parting Shot
Merge pull request #938 from turbedi/patch-1

Fix move animation - Parting Shot
Close auto-started battle servers when server dcs
Merge pull request #935 from turbedi/patch-2

Fix moves in enums.h
Merge pull request #939 from TheUnknownOne/master

Close auto-started battle servers when server dcs

Fix #939
Fix Event Combinations
Remove whitespace
Merge pull request #942 from Fuzzysqurl/eventmove

Remove whitespace
Merge pull request #941 from Fuzzysqurl/eventcombo

Fix Event Combinations
Re-fix move machine, Jirachi/Kyu fix
Actually fix Move Machine
Merge pull request #944 from Fuzzysqurl/fix

Re-fix Move Machine