Merge branch 'master' into prakhar
Major UI Changes.
Merge branch 'prakhar'
Merge branch 'master' into allen