Moved iPhone 6 template to use the marvel device template