i18n - merge
Merge branch 'master' of https://github.com/namvu80ap/AliceBox

# By NAMVU
# Via NAMVU
* 'master' of https://github.com/namvu80ap/AliceBox:
  i18n - Trying to add

Conflicts:
	assets/js/aliceBoxApp.js