adding developer info
Merge branch '1.2'