Modified stuff for client
Merge branch 'master' of https://github.com/skortchmark9/riMap