Merge branch 'testing'

Conflicts:
	theme/base/css/display.css

diff --combined theme/base/css/display.css
index 7eff4709c7b0a9f14f83c7d2fe65fb922c8d6c3c,65dd159900e224426d6338916e615457eaa36105..fb74b1d0b0f36dc1856f31dc8f1e879f80544f37
--- 1/theme/base/css/display.css
--- 2/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@@ -177,7 -177,8 +177,8 @@@ font-weight:bold
  #form_password_recover legend,
  #form_password_change legend,
  .form_entity_block legend,
- #form_filter_bytag legend {
+ #form_filter_bytag legend,
+ #apioauthauthorize_allowdeny {
  display:none;
  }
  
@@@ -895,9 -896,63 +896,63 @@@ font-weight:normal
  margin-right:11px;
  }
  
+ /*applications*/
+ .applications {
+ margin-bottom:18px;
+ float:left;
+ width:100%;
+ }
+ .applications li {
+ list-style-type:none;
+ }
+ .application img,
+ #showapplication .entity_profile img,
+ .form_data #application_icon img,
+ #apioauthauthorize .form_data img {
+ max-width:96px;
+ max-height:96px;
+ }
+ #apioauthauthorize .form_data img {
+ margin-right:18px;
+ float:left;
+ }
+ #showapplication .entity_profile {
+ width:68%;
+ }
+ #showapplication .entity_profile .entity_fn {
+ margin-left:0;
+ }
+ #showapplication .entity_profile .entity_fn .fn:before,
+ #showapplication .entity_profile .entity_fn .fn:after {
+ content:'';
+ }
+ #showapplication .entity_data {
+ clear:both;
+ margin-bottom:18px;
+ }
+ #showapplication .entity_data h2 {
+ display:none;
+ }
+ #showapplication .entity_data dl {
+ margin-bottom:18px;
+ }
+ #showapplication .entity_data dt {
+ font-weight:bold;
+ }
+ #showapplication .entity_data dd {
+ margin-left:1.795%;
+ font-family:monospace;
+ font-size:1.3em;
+ }
+ .form_data #application_types label.radio,
+ .form_data #default_access_types label.radio {
+ width:14.5%;
+ }
+ 
  /* NOTICE */
  .notice,
- .profile {
+ .profile,
+ .application {
  position:relative;
  padding-top:11px;
  padding-bottom:11px;
@@@ -984,12 -1039,13 +1039,17 @@@ overflow:visible
  #showstream .notice div.entry-content {
  margin-left:0;
  }
 +#shownotice .notice .entry-title,
 +#shownotice .notice div.entry-content {
 +margin-left:110px;
 +}
  #shownotice .notice .entry-title {
+ margin-left:110px;
  font-size:2.2em;
+ min-height:123px;
+ }
+ #shownotice .notice div.entry-content {
+ margin-left:0;
  }
  
  .notice p.entry-content {