Working on database implementation
Merge branch 'master' of github.com:jonatanl/fellesprosjekt

Conflicts:
	java/src/Models/Event.java
Also changed alertId to alarmId
Merge branch 'master' of github.com:jonatanl/fellesprosjekt