2014.4.27
Merge branch 'master' of https://github.com/social-map-team/socialmap-client