have language bar inline with main body
adjust language select input size
Merge remote-tracking branch 'origin/master' into adjust-language-selector

* origin/master:
  fixes issue #958; separated embedded CSS tags into individual files
  Removed flatpages fixture and updated README about the same

Conflicts:
	main/static/css/screen.css
	templates/base.html
no longer using class pinned, so remove its definition
test only odk_viewer.TestAttachmentUrl, passes locally but fails in travis
Merge remote-tracking branch 'origin/master' into adjust-language-selector

* origin/master:
  apply a heading bulk upload form
  set context_instance
manual language select
updated copyright text
debug test
use tearDown method to cleanup media folder
test we have attachements already saved
updated error response
use original image link
expecting 200 http status code
remove debug statements
Merge pull request #973 from modilabs/adjust-language-selector

Adjust language selector
Invalid return param use
Merge branch 'master' into 974_export_get_or_create