Version 1 of merge with prototype.
Fixed highlighting bug
Fixed some bugs in arena page
double check code
Merge branch 'amanforindia-master'