Merge branch 'extract_icon_dir_file' of https://github.com/liuzhaoguo/FreeROI
Merge branch 'master' of github.com:BNUCNL/FreeROI
Merge pull request #38 from sealhuang/master

[ADD] add new function `get_data_icon` and update freeroi
PEP8
Merge pull request #39 from xtao/pep8

PEP8 corrected.
Merge branch 'master' of github.com:BNUCNL/FreeROI
add r2i to toolbox and make toolbox_button visible
optimization region grow,make the grow time less than 1 second(the former one is more than 4 seconds)
make the code more standard according to the advice of HLJ
Merge pull request #40 from liuzhaoguo/move_algorithms_to_tools_box

optimization region growing
Add basic tab and move some functions to it. .
Add basic tab and move some functions to it. .
Merge branch 'master' of github.com:BNUCNL/FreeROI

Conflicts:
	froi/gui/component/listwidget.py
With numpy internal function, the speed of binarization operation improves 6 times.
Using the get_icon_dir function to make the code more concise.
Remove some extra intent.
Merge pull request #43 from zhouguangfu/master

 Using the get_icon_dir() function to make the code more concise and remove some extra intent.