i18n in progress
Merge branch 'master' of https://github.com/Sigma-2014-Video-Rental-Store-Project/Workspace