Merge develop into 1206-events-template

Conflicts:
	view/theme/frio/css/style.css

diff --cc .gitignore
index b300f579e299ab2526462792c2ac1bf03a338c83,b300f579e299ab2526462792c2ac1bf03a338c83..77151060d22b03c5add2627e2a6c558f2a0a4d15
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -42,3 -42,3 +42,16 @@@ nbprojec
  \r
  #ignore local folder\r
  /local/\r
++\r
++#other stuff\r
++.directory\r
++.gitignore\r
++\r
++/view/theme/Friendiboot\r
++/view/theme/Viereinhalb\r
++/view/theme/blog\r
++/view/theme/boheme\r
++/view/theme/clean\r
++/view/theme/suckerberg\r
++\r
++/addon/frio_hovercard\r

diff --cc include/datetime.php
Simple merge

diff --cc view/theme/frio/css/style.css
index deb3436ded849cae043c81d2ee4b3dc32f67c646,dc892c60b0a48443f48efc5c350f49ab05c65470..eda0b3d7189688860ca6571cfcf9901b4dda878a
--- 1/view/theme/frio/css/style.css
--- 2/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@@ -1911,77 -1960,62 +1969,133 @@@ ul li:hover .contact-wrapper a.contact-
      clear: both;
  }
  
 +/* Events page */
 +#fc-header {
 +    margin-top: 20px;
 +    margin-bottom: 10px;
 +}
 +#fc-header-left,
 +#fc-header-right,
 +#event-calendar-title {
 +    display: inline-block;
 +}
 +#fc-title {
 +    margin: 0;
 +    padding-left: 20px;
 +
 +}
 +#fc-header-right {
 +    margin-top: -4px;
 +}
 +#event-calendar-title {
 +    vertical-align: middle;
 +}
 +a#event-calendar-views {
 +    padding: 6px 9px;
 +    font-size: 14px
 +}
 +tr.fc-first,
 +tr.fc-first th {
 +    border-left: none;
 +    border-right: none;
 +    border-top: none;
 +}
 +td.fc-day {
 +    border-left: none;
 +    border-right: none;
 +    padding: 0 6px;
 +}
 +#events-calendar .fc-grid .fc-day-number {
 +    float: left;
 +    font-size: 0.9em;
 +}
 +.event-wrapper .event-owner {
 +  margin-bottom: 15px;
 +}
 +.event-wrapper .event-owner img {
 +    display: block;
 +}
 +.event-owner img {
 +    margin-right: 5px;
 +    height: 48px;
 +    width:  48;
 +    border-radius: 3px;
 +}
 +.event-wrapper .vevent {
 +    margin-left: 0;
 +    margin-right: 0;
 +    box-shadow: 1.5px 0 0 0 rgba(0, 0, 0, .1) inset;
 +}
 +.event-wrapper .event-buttons {
 +    margin-top: 15px;
 +}
 +#event-form-wrapper {
 +    padding-top: 5px;
 +}
 +#event-edit-form-wrapper {
 +    padding-top: 15px;
 +}
 +#event-nav a {
 +    color: #555;
 +}
 +#event-edit-form-wrapper #event-edit-time {
 +    padding: 10px 0;
+ /* Profiles Page */
+ .profile-listing-table {
+     display: table;
+     width: 100%;
+ }
+ .profile-listing-row {
+     display: table-row;
+ }
+ .profile-listing-cell {
+     display: table-cell;
+ }
+ .profile-listing-photo {
+     width: 48px;
+     height: 48px;
+     margin: 10px 0px;
+ }
+ #profile-listing-new-link-wrapper {
+     margin-bottom: 20px;
+ }
+ .panel-group-settings {
+     margin-left: -15px;
+     margin-right: -15px;
+ }
+ .panel-group-settings > .panel {
+     padding-left: 15px;
+     padding-right: 15px;
+ }
+ .profiles-content-wrapper #profile-photo-upload-section {
+     display: none;
+     margin-left: -15px;
+     margin-right: -15px;
+     margin-top: 15px;
+     padding: 15px;
+ }
+ #profile-photo-upload-close {
+     font-size: 14px;
+ }
+ 
+ /* Settings */
+ .section-subtitle-wrapper {
+     padding: 1px 10px;
+ }
+ .panel .section-subtitle-wrapper a.accordion-toggle:before {
+     font-family: FontAwesome;
+     content: "\f0d7";
+     padding-right: 5px;
+ }
+ .panel .section-subtitle-wrapper a.accordion-toggle.collapsed:before {
+     font-family: FontAwesome;
+     content: "\f0da";
+ }
+ #settings-nick-wrapper {
+     margin-bottom: 20px;
+ }
+ .group {
+     margin-left: 20px;
  }
  /*
  * Overwriting for transparency and other colors

diff --cc view/theme/frio/js/modal.js
Simple merge

diff --cc view/theme/frio/js/theme.js
Simple merge