Merge branch 'improve-contacts' of git://github.com/davehunt/gaia-ui-tests
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Move gallery tests into gallery/ folder
Merge pull request #353 from zacc/mv_gallery_tests

Move gallery tests