function updates

Signed-off-by: shawnsandy <shawnsandy04@gmail.com>
Merge branch 'feature/twig-base' into develop

Signed-off-by: shawnsandy <shawnsandy04@gmail.com>

Conflicts:
	functions.php
Merge branch 'develop'