update

Fixing messages and regexs
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/edu/ndnu/capstone/domain/EmergencyType.java