Merge branch 'master' of https://github.com/DenverDev/SharingEconomy

Conflicts:
	SharedEcoUI/index.html
update

update
Merge branch 'master' of https://github.com/DenverDev/SharingEconomy

Conflicts:
	SharedEcoUI/index.html