Compressed pngs
Compressed yellow png
Upgraded bootstrap to 3.1.0
Merge branch 'dev' into beta
Merge branch 'beta'