register-login-no activation fix

unclosed c:if tag fix

member role fix

@JsonIgnore added to trip waypointtype
Merge remote-tracking branch 'origin/master'