Squashing commits for the secondary toolbar (2-6-2013)
Merge branch 'settings-bar' of https://github.com/timvandermeij/pdf.js into settings-bar