Merge branch 'hotfix/release' into develop
getGrayNumpyCv2 bug fixed
Merge pull request #230 from jayrambhia/graynumpycv2

getGrayNumpyCv2 bug fixed (Issue #229)
Filename of the image retained

There was a line in the display condition :

```python
self.filename = ""
```
I have commented this.

Now the filename of the image object is retained after running 
the code as mentioned in #231.
Merge pull request #232 from vijaym123/patch-1

Filename of the image retained
Merge branch 'master' of github.com:ingenuitas/SimpleCV