Minor edits
minor
Merge pull request #642 from dcoeurjo/MinorEdits

Minor edits
 # Add a name for each list of geometrics objects in Display3D

 ####in this purpose modified 3 files :

* **in Display3D.h :**
	added vectors of names for each type of geometric list
	added an optionnal parameter _s_ (the name) in the functions which add a list in the lists of lists
* **in Display3D.ih :**
	modified the functions modified in Display3D.h, now they add the name of the new list in the correponding list in the same time.
* **in Display3DFactory.ih :**
	modified the functions draw which use the functions modifed in Dispaly3D.h so that they now give the className of the object they generated the list from as the name of the list when they call the function.
Merge branch 'master' of https://github.com/DGtal-team/DGtal

Conflicts:
	src/DGtal/io/Display3D.h
	src/DGtal/io/Display3D.ih
	src/DGtal/io/Display3DFactory.ih

Most of the problems were indentations differences.
Some functionnalities have been added between the changes too.
 # debug the merging
some characters were genereted by the merge tools
Merge branches 'master' and 'nameForList' into nameForList
 # Change the names of the nameLists
adding my in each name
Merge pull request #647 from alinemartin/nameForList

 # Add a name for each list of geometrics objects in Display3D
Merge branch 'master' of github.com:DGtal-team/DGtal into addAlphaTextureImage