Merge develop into manage

Conflicts:
	view/global.css

diff --cc view/global.css
index d1c07d60aaef5f0b474887922f68fe795c54bd68,55f44ee51b9d66b5a7921c18f7df2a3d62af69b4..477f778d9a11aeffed52b9c5ca5cf62c9db2c4e9
--- 1/view/global.css
--- 2/view/global.css
+++ b/view/global.css
@@@ -213,47 -213,19 +213,63 @@@ a 
    border: 0;
  }
  
- }
 +.itentity-match-wrapper {
 +  float: left;
 +  padding: 10px;
 +  width: 120px;
 +  height: 140px;
 +  margin-bottom: 20px;
 +}
 +
 +.identity-match-photo {
 +  float: left;
 +  text-align: center;
 +  width: 120px;
 +}
 +
 +.identity-match-name {
 +  text-align: center;
 +}
 +
 +.identity-match-details {
 +  float: left;
 +  text-align: center;
 +  width: 120px;
 +  overflow: hidden;
 +  font-size: 10px;
 +  font-weight: 500;
 +  color: #999999;
 +}
 +
 +.identity-match-break, .identity-match-end {
 +  clear: both;
 +}
 +
 +.identity-match-photo button {
 +  border: none;
 +  padding: 0;
 +  margin: 0;
 +  background: none;
 +  height: 80px;
 +  width: 80px;
 +}
 +
 +.selected-identity img {
 +  border: 2px solid #ff0000;
++}
+ /* poke */
+ #poke-desc {
+       margin: 5px 0 10px;
+ }
+ 
+ #poke-wrapper  {
+       padding: 10px 0 0px;
+ }
+ 
+ #poke-recipient, #poke-action, #poke-privacy-settings {
+       margin: 10px 0 30px;
+ }
+ 
+ #poke-recip-label, #poke-action-label, #prvmail-message-label {
+       margin: 10px 0 10px;
+ }

diff --cc view/theme/frost-mobile/style.css
Simple merge

diff --cc view/theme/frost/style.css
Simple merge