add user_current_position
merge branch 'master' of https://github.com/arribbar/angelhack