Revert "This is master brach at 20/10/2013"

This reverts commit 011fe7e1aba9649d04d6ed351378899a4ec7efba.