aligned the files i have edited in this brank to trunk of 01 sept 2014