Merge branch 'master' of github.com:PCGen/pcgen
Merge branch 'master' of github.com:PCGen/pcgen
Merge branch 'master' of github.com:PCGen/pcgen
Merge branch 'master' of github.com:PCGen/pcgen
Fix DATA-2004
Merge branch 'master' of github.com:PCGen/pcgen
Merge pull request #60 from Manichee/DATA-2004

Fix DATA-2004
Merge branch 'master' of github.com:PCGen/pcgen
fix DATA-2014
Merge pull request #61 from Manichee/DATA-2014

fix DATA-2014
Merge branch 'master' of github.com:PCGen/pcgen
merge conflicts
Add build to ignore
Add build to ignore
Merge conflict
Merge branch 'master' of github.com:karianna/pcgen