Merge branch 'Kelly'
Update .gitignore
Merge branch 'Kelly'

Conflicts:
	.gitignore
merge with branch “Kelly”
fixed it so when a new page is added the default buttons look selected
updates
Adam - Just pushing changes to LayeredPanel that allows for setting a "background" image.
Merge branch 'master' into Kelly