added the xregexp files
Merging upstream
Whoops, bad merge
Wrapped all view strings in i18n local
Moved i18n wrapper into formMacros, and out of calls to it - to make things work better
Typo fix
refactored showField i18n wrapping to be inside macros
Do yoga in various uncomfortable poses to accomplish i18n for page type names.
Merge remote-tracking branch 'punkave/master'
Merge remote-tracking branch 'punkave/master'
Merge branch 'upstream-fixes'
Merge branch 'upstream-fixes'
Merge remote-tracking branch 'punkave/master'
Implementing afterGet
Merge branch 'upstream-fixes'
Refactoring some of the i18n
i18n improvements
we don't want to make everything require a 'res'
Require i18n
Merge remote-tracking branch 'punkave/master'