add user, user_status
add location
Merge branch 'feature/add_api' into develop
Merge branch 'release/release-20140218-1'