Merge branch 'my2nddev'
Merge branch 'master' of github.com:ricktetstall/socialliquidity