Pushing new changes
Updated
Merge branch 'pull_rauhryan_20131017114629826'

Conflicts:
	app/assets/javascripts/movies/movie_library.js
	jspec/movie_library_spec.js
Updated