Use i18n branch, plus angular-translate resolutions

@tejohnso please review