updated contact card stuff
Merge branch 'master' of https://github.com/jaruesink/greek-app

Conflicts:
	Static/taggingmembers.html
Merge branch 'master' of https://github.com/jaruesink/greek-app