added s9500,m nikon e6
Merge remote-tracking branch 'svn/trunk'