Merge pull request #2 from forax/master

sync with forax/movie_buddy
Merge pull request #2 from devoxx2014-webperf/master

Merge pull request #2 from forax/master