SSO password hashing fix
SSO password hash issue: cleanup and fixing
Cleaned up dependencies
SSO password hash: added sha1 hash algorithm
SSO hashing fix
highlight user comment of proposal author
Remove the "detail" and "print" button in the wiki
Add discussion annotation with user role
Added annotation in discussion about user role
bugfix: user authentication recognition now working properly
show "detail" and "print" button in the wiki for privileged user only
Added tooltipster plugin
Added a sponsor link to a contest sponsor logo
Merge branch 'sponsor_link' of https://github.com/CCI-MIT/XCoLab into sponsor_link

Conflicts:
	portlets/proposals-portlet/src/main/webapp/WEB-INF/views/contestProposals/header_contest_details.jspx
Increased size of contest description db field
Merge branch 'refs/heads/wiki_remove_buttons' into master_integration
Merge remote-tracking branch 'origin/comment_role_annotation' into master_integration

Conflicts:
	portlets/proposals-portlet/src/main/webapp/css/proposals.css
Merge branch 'refs/heads/sponsor_link' into master_integration
small fixes
Merge remote-tracking branch 'origin/sso_pwhash_fix' into master_integration