Merge origin/master

Conflicts:
	pom.xml
	src/main/java/com/hackathon/model/Event.java
Merge origin/master

Conflicts:
	src/main/java/com/hackathon/model/Event.java
Merge origin/master

Conflicts:
	src/main/java/com/hackathon/model/Event.java