Updated
Merge branch 'master' of https://github.com/britzke/shareezy.git