Added rhine support for flow similarity
Merge branch 'master' of https://github.com/nbingham1/Patch

Conflicts:
	ui/cgi/api.py