share
mergin
Merge branch 'master' of github.com:soad003/flatman
dashboard share, sharing...
locales
Merge branch 'master' of github.com:soad003/flatman

Conflicts:
	config/locales/en.yml