Merge branch 'dev'
ImageProcessing updated (innerEclipse and outerEclipse made public in Marker2CC to be able to determine marker's size)
VS2013 upgrade