Commit
Merge branch 'master' of https://github.com/toleabivol/elara

Conflicts:
	functions.php
	theme_config/views/shortcodes/theme_specific/blog_posts.php