Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Change o the ChangeLocaleServlet to ChangeLocaleController with the help of @eprogramming
Merge pull request #101 from efraimgentil/master

Change o the ChangeLocaleServlet to ChangeLocaleController