Merge branch 'master' of https://github.com/lanxiang/JavaMUD
Merge pull request #25 from BouwenJ/master

sql file updated
Merge branch 'master' of https://github.com/BouwenJ/JavaMUD
Merge Jens SQL
HeeftActie interface -> abstract class
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD.git
commit
ActieTypes enum.
Merge pull request #26 from toyamigo/master

commit
NullType toegevoegd
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD.git
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD
Updated services & dao
Het werkt nu.
Fixing git
KarakterDAO @Repository annotation
--Actie
KarakterController fix
HET WERKT!!!
Merge pull request #27 from BouwenJ/master

sql: constraint name conflict fix