making changes to update
Merge branch 'master' of github.com:atpaino/socialsonar