add draft movie detail view
resolve merge conflicts
Merge branch 'master' of https://github.com/faithyl/ClassProj

Conflicts:
	SoMovie/SoMovie/Movie.swift
	SoMovie/SoMovie/MoviesViewController.swift
	SoMovie/SoMovie/RottenClient.swift