Compressed images
Upgraded bootstrap to 3.1.0
Merge branch 'dev'