tuannv_commit_testing
tuannv_commit_selenium_test_UI
tuannv_commit_test_karma_jasmine
tuannv_commit_test_karma_rasmine
tuannv_commit_selenium_test_UI
tuannv_commit_test_karma_rasmine
tuannv_commit_grunt_karma_jasmine_test
tuannv_commit_grunt_karma_jasmine_test
tuannv_commit_grunt_karma_jasmine_test
tuannv_commit_grunt_karma_jasmine_test
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 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