Update screenshot
Update to Bootstrap 3.3.1
Merge branch 'dev'