Merge branch 'develop' of https://github.com/alextselegidis/easyappointments into develop

rsc/db/sample-data.sql

@@ -22,8 +22,8 @@ INSERT INTO `ea_settings` (`id`, `name`, `value`) VALUES
 (3, 'company_name', 'ABC Company'),
 (4, 'company_email', 'info@abc-company.ea'),
 (5, 'company_link', 'http://www.abc-company.ea'),
-(6, 'google_analytics_code', '');
-(7, 'customer_notifications', '1');
+(6, 'google_analytics_code', ''),
+(7, 'customer_notifications', '1'),
 (8, 'date_format', 'DMY');
 
 --

src/application/views/backend/calendar.php

@@ -79,7 +79,7 @@
 
                 <button id="insert-unavailable" class="btn btn-default"
                         title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>">
-                    <span class="glyphicon glyphicon-plus"></i>
+                    <span class="glyphicon glyphicon-plus"></span>
                     <?php echo $this->lang->line('unavailable'); ?>
                 </button>
             </div>