Included the modifications of feture2v.1 feture3v.1
hot fix done
resolved conflicts