document prototype
commit
Merge branch 'master' of https://github.com/lightquartz/PFE_Nicolas_Matthieu

Conflicts:
	3DCam_Unity/Library/CurrentLayout.dwlt
	3DCam_Unity/Library/assetDatabase3
	3DCam_Unity/Library/expandedItems