Major Update!

Merged Crystal Dev and Crystal Home.