before pull
merge conf
add user from reduced api to core data
Merge branch 'master' of https://github.com/Dareryan/Shortpath