Added event overlap filter
Merge branch 'master' of github.com:jonatanl/fellesprosjekt

Conflicts:
	java/src/client/AddEvent.java
Added joda-time to project for easier date api
Still not able to detect overlapping events and I have no clue why
Merge branch 'master' of github.com:jonatanl/fellesprosjekt