Merge "Fixed calendar appcontrol" into tizen_2.1