some changes
Merge branch 'master' into matching_rule_improvement
for testing server/client
Update contact.php

Removed the for testing line
Merge pull request #14 from HSWebteam/test_server_client

For testing server+client