Merging development branch
Merge branch 'master' into development

* master:
  Creating localstorage for current position

Conflicts:
	public/js/the-movies.min.js