Merge branch 'master' into test1
conflcit on cp
Merge branch 'master' into test1

Conflicts:
	demo.livecode.vcs/cards/65405F61-5062-46DA-8EC2-4748E5524DC6/79F270DA-9E6D-4C1B-BBD4-1BF1C50C09AB/properties.json
Merge branch 'test1'
add a button
testing
delete and add button
possible new structure
newlines
test layers
layers
Merge branch 'layers' into test2

Conflicts:
	demo.livecode.vcs/65/405F61-5062-46DA-8EC2-4748E5524DC6/layers.txt
using cREVGeneral plugin
Merge branch 'test2'