noproxy:
Merge branch 'proxy' of github.com:vramosp/socialmusicapp into proxy