UI
Merge branch 'master' of https://github.com/juliali/movie_analytics

Conflicts:
	src/MovieAnalyticApp.java
	web/index.jsp