[hotfix/1.0.1] fixes
Merge pull request #20 from chimericdream-personal/hotfix/1.0.1

[hotfix/1.0.1] fixes
Merge branch 'master' into develop

Conflicts:
	public_html/assets/js/compiled/app/collection/movies.min.js
working on software
work worky work
oops