Added Panels
Resolved conflicts

Conflicts:
	.DS_Store
	composer/.DS_Store
	storylayers.html