(fixes corruption from IDEA->network problems); login styling and modals begun; study styling and tabs begun; login header fixed; less organized more.
(fixes corruption from IDEA->network problems); login styling and modals begun; study styling and tabs begun; login header fixed; less organized more.
Merge branch 'gui' of https://github.com/databrary/play into gui

Conflicts:
	.gitignore
	README
	app/assets/javascripts/main.js
	app/assets/stylesheets/libs/_body.less
	app/assets/stylesheets/libs/_footer.less
	app/assets/stylesheets/libs/_forms.less
	app/assets/stylesheets/libs/_grid.less
	app/assets/stylesheets/libs/_header.less
	app/assets/stylesheets/libs/_mixins.less
	app/assets/stylesheets/libs/_normalize.less
	app/assets/stylesheets/libs/_pages.less
	app/assets/stylesheets/libs/_queries.less
	app/assets/stylesheets/libs/_regions.less
	app/assets/stylesheets/libs/_tables.less
	app/assets/stylesheets/libs/_typography.less
	app/assets/stylesheets/libs/_variables.less
	app/assets/stylesheets/libs/_widgets.less
	app/assets/stylesheets/main.less
	app/controllers/static.scala
	app/views/assetCreate.scala.html
	app/views/assetEdit.scala.html
	app/views/assetLink.scala.html
	app/views/authorizeAdmin.scala.html
	app/views/display.scala
	app/views/error/on400.scala.html
	app/views/error/on404.scala.html
	app/views/error/on500.scala.html
	app/views/login.scala.html
	app/views/package.scala
	app/views/party.scala.html
	app/views/partyAdmin.scala.html
	app/views/region/comments.scala.html
	app/views/region/commentsStudy.scala.html
	app/views/region/crudHeaderStudy.scala.html
	app/views/region/modalLogin.scala.html.tmp
	app/views/region/siteHeaderNav.scala.html
	app/views/slot.scala.html
	app/views/slotEdit.scala.html
	app/views/static/about.scala.html
	app/views/static/board.scala.html
	app/views/static/contact.scala.html
	app/views/static/contributors.scala.html
	app/views/static/faq.scala.html
	app/views/static/index.scala.html
	app/views/static/jobs.scala.html
	app/views/static/policies.scala.html
	app/views/static/team.scala.html
	app/views/study.scala.html
	app/views/studyEdit.scala.html
	app/views/tag/minimalFieldConstructor.scala.html
	app/views/template/crud.scala.html
	app/views/template/html5.scala.html
	app/views/template/raw.scala.html
	app/views/template/static.scala.html
	app/views/template/wide.scala.html
	app/views/widget/assetList.scala.html
	conf/application.conf
	conf/evolutions/default/1.sql
	conf/routes
	media/build.sbt
	public/images/draft.png
	public/images/favicon.png
	public/images/profiles/david.jpg
Merge remote-tracking branch 'remotes/origin/master' into gui

Conflicts:
	README.md
	app/views/assetCreate.scala.html
	app/views/assetEdit.scala.html
	app/views/assetLink.scala.html
	app/views/assetList.scala.html
	app/views/login.scala.html
	app/views/party.scala.html
	app/views/partyAdmin.scala.html
	app/views/slot.scala.html
	app/views/slotEdit.scala.html
	app/views/study.scala.html
	app/views/studyEdit.scala.html
	media/build.sbt
Assorted fixes for merge with master
Login form now says "Email"
Fixup gui for merge to master

Revert inappropriate (corrupted) changes; fix newlines