#13 correct emial and phone links to provide phone number and email sddress repectively.
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/jsp/contact-jQM.jsp