resolve
Merge branch 'master' of https://github.com/simvisage/simvisage.git

Conflicts:
	quaducom/quaducom/devproc/exp_browse.py