Merge branch 'master' into develop
change all colors
Merge remote-tracking branch 'origin/master' into develop
Redesign the research page
update lifestream
Merge branch 'develop'