Merge pull request #1 from robnyman/gh-pages

Update fork
Merge branch 'gh-pages' of git://github.com/robnyman/Firefox-OS-Boilerplate-App into robnyman-gh-pages

update
Merge pull request #38 from fharper/gh-pages

Added screen wake lock
Merge pull request #39 from fharper/gh-pages

Moved the screen wake lock under WebAPI
L10n: Added es, tr. Updated de, hi, id, it_IT, ja, nl and pt_BR.
Adding a humans.txt to acknowledge contributors.
Fixing small typo.
Merge pull request #40 from christi3k/gh-pages

L10n update + humans.txt
Improve German localization
Merge pull request #42 from Archaeopteryx/locales-de-20140131-1

Improve German localization
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
new font and new style
ops
new image for button
Add the nocrop option to the image pick activity

This should help avoid OOM errors in FxOS 1.3 until we can make no crop the default.
See https://bugzilla.mozilla.org/show_bug.cgi?id=959430

Note that I have not tested this pull request.  (Sorry!)
fix path
Merge pull request #45 from davidflanagan/patch-1

Add the nocrop option to the image pick activity
Merge pull request #46 from Mte90/gh-pages

New graphic
Added information about the gaia look & feel of the boilerplate