Merge
Remove merge dir
1
Update .gitignore
1
Update .gitignore
Removed JEP - Parser Servlet is not used
1
Included the Clique feature.
-Added coclique3 binary (included coclique3 in the build process and
makefile
-Numbering of equilibria in the native LRS algorithm
-Process the equilibria numbering to with coclique3
###Does not work in a windows environment, because coclique3 does not
compile so far under windows
Added stack allocation to the compile process for windows system,
because coclique3 stores a lot a variables on it.
Now coclique3 runs under windows os, too
Added a new ANT target to build the GTE without Server components. Refer
to the Readme_gte_without_server_components
Bug removed: Multiple spaces in payoffs string are counted as one space
to separate payoffs
test
Ignore Flex development files
Update build properties: windows path
Nnumber
test
Merge pull request #7 from trobar/master

Martin's changes April-Oct 2013