Merge branch 'naffanya-dev'

diff --cc include/stg/user.h
Simple merge

diff --cc include/stg/users.h
Simple merge

diff --cc projects/stargazer/main.cpp
Simple merge

diff --cc projects/stargazer/user_impl.cpp
Simple merge

diff --cc projects/stargazer/user_impl.h
Simple merge