Update
Merge branch 'master' of https://github.com/icommstudios/localsharingtree

Conflicts:
	.gitignore