Added WrapPanel control
cleanup
Restored project settings.
Updated declaration file.
Merge branch 'Sally-Xu-master'