tuannv_commit_selenium_test_UI
tuannv_commit_selenium_test_UI
tuannv_commit_selenium_test_UI
Merge branch 'master' into tuannv_test_karma_jasmine

Conflicts:
	src/main/webapp/js/movie-list-view.js
	src/main/webapp/js/test/test-main.js
	src/main/webapp/karma.conf.js
	src/main/webapp/package.json
Merge branch 'master' into uannv_Selenium_Delete_Element

Conflicts:
	pom.xml