Renamed `fa` twig function to `fa_icon`
`fa_icon` takes an otional `options` array for additional options of the generated icon
Added twig function `fa_stacked_icon` for generation of stacked icons
Merge origin/master