Fontawesome to UI
Merge branch 'master' of https://github.com/toleabivol/elara

Conflicts:
	theme_config/shortcodes-options.php