platillita
editar movie

editar movie
Merge branch 'master' of https://github.com/dianagpe/kwk

Conflicts:
	app/controllers/Application.java
	app/views/movies2.scala.html
	app/views/search.scala.html