alt update
updated staging with develop
fixed buge
fixed bugs
fixed bug
rm index.html in staging cuse of bug
Merge branch 'develop' into staging

Conflicts:
	index.html
Merge branch 'develop' into staging
test