adding functions.php
Functions.php from develop is merged to master