added research tab
merge conflict fixed