Thailand drops martial law, keeps powers