Escaped some inputs.
Merge branch 'master' of https://github.com/sarukuku/Vahdin

Conflicts:
	src/vahdin/view/SuggestedMarkView.java