added samples and up merged from pego
resolved merge status
fixed bad project file merge