config app var
Merge branch 'dev'