fixed bug

joshua, shuotian
added selenium tests

advance testing
fixed conflicts