merge step one
fix conflict
Fixing the stuff.
Merge branch 'jake'
Merge branch 'master' into prakhar
Adding/removing image resource files.
Merge branch 'master' into prakhar
Merge branch 'prakhar'
Merge branch 'master' into allen