Merge pull request #142 from ahmet-celik/master

Moved location of headerSize in base header
Merge branch 'master' of https://github.com/googlei18n/incremental-fonts

Conflicts:
	run_time/src/gae_server/chrome/js/binary-font-editor.js
Merge branch 'master' of https://github.com/googlei18n/incremental-fonts

Conflicts:
	run_time/src/gae_server/chrome/js/binary-font-editor.js