Added a colors local to define device color in the designs.json file
Moved iPhone 6 template to use the marvel device template
Migrated iPads to Marvel's devices.css
Clean up of old images/PSDs