diff --git a/Gemfile b/Gemfile
index 7da812cc..b2a23adb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,6 +46,7 @@ gem 'uglifier', '>= 1.3.0'
 
 # as the front-end framework
 gem 'bootstrap-sass'
+gem 'autoprefixer-rails'
 gem 'formtastic-bootstrap'
 gem 'formtastic', '~> 2.3.0.rc3'
 gem 'momentjs-rails', '>= 2.8.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 86d166f3..c9cce0ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,6 +56,8 @@ GEM
       uuidtools
     arel (5.0.1.20140414130214)
     ast (2.0.0)
+    autoprefixer-rails (4.0.1)
+      execjs
     awesome_nested_set (3.0.0.rc.5)
       activerecord (>= 4.0.0, < 5)
     axlsx (2.0.1)
@@ -432,6 +434,7 @@ DEPENDENCIES
   acts_as_commentable_with_threading
   acts_as_list
   ahoy_matey
+  autoprefixer-rails
   awesome_nested_set (~> 3.0.0.rc.5)
   axlsx_rails
   bootstrap-sass
diff --git a/app/assets/stylesheets/fonts/suse-icons.eot b/app/assets/fonts/suse-icons.eot
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.eot
rename to app/assets/fonts/suse-icons.eot
diff --git a/app/assets/stylesheets/fonts/suse-icons.svg b/app/assets/fonts/suse-icons.svg
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.svg
rename to app/assets/fonts/suse-icons.svg
diff --git a/app/assets/stylesheets/fonts/suse-icons.ttf b/app/assets/fonts/suse-icons.ttf
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.ttf
rename to app/assets/fonts/suse-icons.ttf
diff --git a/app/assets/stylesheets/fonts/suse-icons.woff b/app/assets/fonts/suse-icons.woff
similarity index 100%
rename from app/assets/stylesheets/fonts/suse-icons.woff
rename to app/assets/fonts/suse-icons.woff
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b81e82d5..0370bfd9 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require waypoints
 //= require dataTables/jquery.dataTables
 //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
 //= require cocoon
diff --git a/app/assets/javascripts/jquery-ui-timepicker-addon.js b/app/assets/javascripts/jquery-ui-timepicker-addon.js
deleted file mode 100644
index 1bc8d53b..00000000
--- a/app/assets/javascripts/jquery-ui-timepicker-addon.js
+++ /dev/null
@@ -1,1902 +0,0 @@
-/*
- * jQuery timepicker addon
- * By: Trent Richardson [http://trentrichardson.com]
- * Version 1.1.2
- * Last Modified: 01/19/2013
- *
- * Copyright 2012 Trent Richardson
- * You may use this project under MIT or GPL licenses.
- * http://trentrichardson.com/Impromptu/GPL-LICENSE.txt
- * http://trentrichardson.com/Impromptu/MIT-LICENSE.txt
- */
-
-/*jslint evil: true, white: false, undef: false, nomen: false */
-
-(function($) {
-
-	/*
-	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
-	*/
-	$.ui.timepicker = $.ui.timepicker || {};
-	if ($.ui.timepicker.version) {
-		return;
-	}
-
-	/*
-	* Extend jQueryUI, get it started with our version number
-	*/
-	$.extend($.ui, {
-		timepicker: {
-			version: "1.1.2"
-		}
-	});
-
-	/* 
-	* Timepicker manager.
-	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
-	* Settings for (groups of) time pickers are maintained in an instance object,
-	* allowing multiple different settings on the same page.
-	*/
-	function Timepicker() {
-		this.regional = []; // Available regional settings, indexed by language code
-		this.regional[''] = { // Default regional settings
-			currentText: 'Now',
-			closeText: 'Done',
-			amNames: ['AM', 'A'],
-			pmNames: ['PM', 'P'],
-			timeFormat: 'HH:mm',
-			timeSuffix: '',
-			timeOnlyTitle: 'Choose Time',
-			timeText: 'Time',
-			hourText: 'Hour',
-			minuteText: 'Minute',
-			secondText: 'Second',
-			millisecText: 'Millisecond',
-			timezoneText: 'Time Zone',
-			isRTL: false
-		};
-		this._defaults = { // Global defaults for all the datetime picker instances
-			showButtonPanel: true,
-			timeOnly: false,
-			showHour: true,
-			showMinute: true,
-			showSecond: false,
-			showMillisec: false,
-			showTimezone: false,
-			showTime: true,
-			stepHour: 1,
-			stepMinute: 1,
-			stepSecond: 1,
-			stepMillisec: 1,
-			hour: 0,
-			minute: 0,
-			second: 0,
-			millisec: 0,
-			timezone: null,
-			useLocalTimezone: false,
-			defaultTimezone: "+0000",
-			hourMin: 0,
-			minuteMin: 0,
-			secondMin: 0,
-			millisecMin: 0,
-			hourMax: 23,
-			minuteMax: 59,
-			secondMax: 59,
-			millisecMax: 999,
-			minDateTime: null,
-			maxDateTime: null,
-			onSelect: null,
-			hourGrid: 0,
-			minuteGrid: 0,
-			secondGrid: 0,
-			millisecGrid: 0,
-			alwaysSetTime: true,
-			separator: ' ',
-			altFieldTimeOnly: true,
-			altTimeFormat: null,
-			altSeparator: null,
-			altTimeSuffix: null,
-			pickerTimeFormat: null,
-			pickerTimeSuffix: null,
-			showTimepicker: true,
-			timezoneIso8601: false,
-			timezoneList: null,
-			addSliderAccess: false,
-			sliderAccessArgs: null,
-			controlType: 'slider',
-			defaultValue: null,
-			parse: 'strict'
-		};
-		$.extend(this._defaults, this.regional['']);
-	}
-
-	$.extend(Timepicker.prototype, {
-		$input: null,
-		$altInput: null,
-		$timeObj: null,
-		inst: null,
-		hour_slider: null,
-		minute_slider: null,
-		second_slider: null,
-		millisec_slider: null,
-		timezone_select: null,
-		hour: 0,
-		minute: 0,
-		second: 0,
-		millisec: 0,
-		timezone: null,
-		defaultTimezone: "+0000",
-		hourMinOriginal: null,
-		minuteMinOriginal: null,
-		secondMinOriginal: null,
-		millisecMinOriginal: null,
-		hourMaxOriginal: null,
-		minuteMaxOriginal: null,
-		secondMaxOriginal: null,
-		millisecMaxOriginal: null,
-		ampm: '',
-		formattedDate: '',
-		formattedTime: '',
-		formattedDateTime: '',
-		timezoneList: null,
-		units: ['hour','minute','second','millisec'],
-		control: null,
-
-		/* 
-		* Override the default settings for all instances of the time picker.
-		* @param  settings  object - the new settings to use as defaults (anonymous object)
-		* @return the manager object
-		*/
-		setDefaults: function(settings) {
-			extendRemove(this._defaults, settings || {});
-			return this;
-		},
-
-		/*
-		* Create a new Timepicker instance
-		*/
-		_newInst: function($input, o) {
-			var tp_inst = new Timepicker(),
-				inlineSettings = {},
-                fns = {},
-		        overrides, i;
-
-			for (var attrName in this._defaults) {
-				if(this._defaults.hasOwnProperty(attrName)){
-					var attrValue = $input.attr('time:' + attrName);
-					if (attrValue) {
-						try {
-							inlineSettings[attrName] = eval(attrValue);
-						} catch (err) {
-							inlineSettings[attrName] = attrValue;
-						}
-					}
-				}
-			}
-		    overrides = {
-		        beforeShow: function (input, dp_inst) {
-		            if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
-		                return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
-		            }
-		        },
-		        onChangeMonthYear: function (year, month, dp_inst) {
-		            // Update the time as well : this prevents the time from disappearing from the $input field.
-		            tp_inst._updateDateTime(dp_inst);
-		            if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
-		                tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
-		            }
-		        },
-		        onClose: function (dateText, dp_inst) {
-		            if (tp_inst.timeDefined === true && $input.val() !== '') {
-		                tp_inst._updateDateTime(dp_inst);
-		            }
-		            if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
-		                tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
-		            }
-		        }
-		    };
-		    for (i in overrides) {
-		        if (overrides.hasOwnProperty(i)) {
-		            fns[i] = o[i] || null;
-		        }
-		    }
-		    tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, o, overrides, {
-		        evnts:fns,
-		        timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
-		    });
-			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function(val) {
-				return val.toUpperCase();
-			});
-			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function(val) {
-				return val.toUpperCase();
-			});
-
-			// controlType is string - key to our this._controls
-			if(typeof(tp_inst._defaults.controlType) === 'string'){
-				if($.fn[tp_inst._defaults.controlType] === undefined){
-					tp_inst._defaults.controlType = 'select';
-				}
-				tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
-			}
-			// controlType is an object and must implement create, options, value methods
-			else{ 
-				tp_inst.control = tp_inst._defaults.controlType;
-			}
-
-			if (tp_inst._defaults.timezoneList === null) {
-				var timezoneList = ['-1200', '-1100', '-1000', '-0930', '-0900', '-0800', '-0700', '-0600', '-0500', '-0430', '-0400', '-0330', '-0300', '-0200', '-0100', '+0000', 
-									'+0100', '+0200', '+0300', '+0330', '+0400', '+0430', '+0500', '+0530', '+0545', '+0600', '+0630', '+0700', '+0800', '+0845', '+0900', '+0930', 
-									'+1000', '+1030', '+1100', '+1130', '+1200', '+1245', '+1300', '+1400'];
-
-				if (tp_inst._defaults.timezoneIso8601) {
-					timezoneList = $.map(timezoneList, function(val) {
-						return val == '+0000' ? 'Z' : (val.substring(0, 3) + ':' + val.substring(3));
-					});
-				}
-				tp_inst._defaults.timezoneList = timezoneList;
-			}
-
-			tp_inst.timezone = tp_inst._defaults.timezone;
-			tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin? tp_inst._defaults.hourMin : 
-							tp_inst._defaults.hour > tp_inst._defaults.hourMax? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
-			tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin? tp_inst._defaults.minuteMin : 
-							tp_inst._defaults.minute > tp_inst._defaults.minuteMax? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
-			tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin? tp_inst._defaults.secondMin : 
-							tp_inst._defaults.second > tp_inst._defaults.secondMax? tp_inst._defaults.secondMax : tp_inst._defaults.second;
-			tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin? tp_inst._defaults.millisecMin : 
-							tp_inst._defaults.millisec > tp_inst._defaults.millisecMax? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
-			tp_inst.ampm = '';
-			tp_inst.$input = $input;
-
-			if (o.altField) {
-				tp_inst.$altInput = $(o.altField).css({
-					cursor: 'pointer'
-				}).focus(function() {
-					$input.trigger("focus");
-				});
-			}
-
-			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
-				tp_inst._defaults.minDate = new Date();
-			}
-			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
-				tp_inst._defaults.maxDate = new Date();
-			}
-
-			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
-			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
-				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
-			}
-			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
-				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
-			}
-			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
-				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
-			}
-			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
-				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
-			}
-			tp_inst.$input.bind('focus', function() {
-				tp_inst._onFocus();
-			});
-
-			return tp_inst;
-		},
-
-		/*
-		* add our sliders to the calendar
-		*/
-		_addTimePicker: function(dp_inst) {
-			var currDT = (this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val();
-
-			this.timeDefined = this._parseTime(currDT);
-			this._limitMinMaxDateTime(dp_inst, false);
-			this._injectTimePicker();
-		},
-
-		/*
-		* parse the time string from input value or _setTime
-		*/
-		_parseTime: function(timeString, withDate) {
-			if (!this.inst) {
-				this.inst = $.datepicker._getInst(this.$input[0]);
-			}
-
-			if (withDate || !this._defaults.timeOnly) {
-				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-				try {
-					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
-					if (!parseRes.timeObj) {
-						return false;
-					}
-					$.extend(this, parseRes.timeObj);
-				} catch (err) {
-					$.datepicker.log("Error parsing the date/time string: " + err +
-									"\ndate/time string = " + timeString +
-									"\ntimeFormat = " + this._defaults.timeFormat +
-									"\ndateFormat = " + dp_dateFormat);
-					return false;
-				}
-				return true;
-			} else {
-				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
-				if (!timeObj) {
-					return false;
-				}
-				$.extend(this, timeObj);
-				return true;
-			}
-		},
-
-		/*
-		* generate and inject html for timepicker into ui datepicker
-		*/
-		_injectTimePicker: function() {
-			var $dp = this.inst.dpDiv,
-				o = this.inst.settings,
-				tp_inst = this,
-				litem = '',
-				uitem = '',
-				max = {},
-				gridSize = {},
-				size = null;
-
-			// Prevent displaying twice
-			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
-				var noDisplay = ' style="display:none;"',
-					html = '<div class="ui-timepicker-div'+ (o.isRTL? ' ui-timepicker-rtl' : '') +'"><dl>' + '<dt class="ui_tpicker_time_label"' + ((o.showTime) ? '' : noDisplay) + '>' + o.timeText + '</dt>' + 
-								'<dd class="ui_tpicker_time"' + ((o.showTime) ? '' : noDisplay) + '></dd>';
-
-				// Create the markup
-				for(var i=0,l=this.units.length; i<l; i++){
-					litem = this.units[i];
-					uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
-					// Added by Peter Medeiros:
-					// - Figure out what the hour/minute/second max should be based on the step values.
-					// - Example: if stepMinute is 15, then minMax is 45.
-					max[litem] = parseInt((o[litem+'Max'] - ((o[litem+'Max'] - o[litem+'Min']) % o['step'+uitem])), 10);
-					gridSize[litem] = 0;
-
-					html += '<dt class="ui_tpicker_'+ litem +'_label"' + ((o['show'+uitem]) ? '' : noDisplay) + '>' + o[litem +'Text'] + '</dt>' + 
-								'<dd class="ui_tpicker_'+ litem +'"><div class="ui_tpicker_'+ litem +'_slider"' + ((o['show'+uitem]) ? '' : noDisplay) + '></div>';
-
-					if (o['show'+uitem] && o[litem+'Grid'] > 0) {
-						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-						if(litem == 'hour'){
-							for (var h = o[litem+'Min']; h <= max[litem]; h += parseInt(o[litem+'Grid'], 10)) {
-								gridSize[litem]++;
-								var tmph = $.datepicker.formatTime(useAmpm(o.pickerTimeFormat || o.timeFormat)? 'hht':'HH', {hour:h}, o);									
-								html += '<td data-for="'+litem+'">' + tmph + '</td>';
-							}
-						}
-						else{
-							for (var m = o[litem+'Min']; m <= max[litem]; m += parseInt(o[litem+'Grid'], 10)) {
-								gridSize[litem]++;
-								html += '<td data-for="'+litem+'">' + ((m < 10) ? '0' : '') + m + '</td>';
-							}
-						}
-
-						html += '</tr></table></div>';
-					}
-					html += '</dd>';
-				}
-				
-				// Timezone
-				html += '<dt class="ui_tpicker_timezone_label"' + ((o.showTimezone) ? '' : noDisplay) + '>' + o.timezoneText + '</dt>';
-				html += '<dd class="ui_tpicker_timezone" ' + ((o.showTimezone) ? '' : noDisplay) + '></dd>';
-
-				// Create the elements from string
-				html += '</dl></div>';
-				var $tp = $(html);
-
-				// if we only want time picker...
-				if (o.timeOnly === true) {
-					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
-					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
-				}
-				
-				// add sliders, adjust grids, add events
-				for(var i=0,l=tp_inst.units.length; i<l; i++){
-					litem = tp_inst.units[i];
-					uitem = litem.substr(0,1).toUpperCase() + litem.substr(1);
-
-					// add the slider
-					tp_inst[litem+'_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_'+litem+'_slider'), litem, tp_inst[litem], o[litem+'Min'], max[litem], o['step'+uitem]);
-
-					// adjust the grid and add click event
-					if (o['show'+uitem] && o[litem+'Grid'] > 0) {
-						size = 100 * gridSize[litem] * o[litem+'Grid'] / (max[litem] - o[litem+'Min']);
-						$tp.find('.ui_tpicker_'+litem+' table').css({
-							width: size + "%",
-							marginLeft: o.isRTL? '0' : ((size / (-2 * gridSize[litem])) + "%"),
-							marginRight: o.isRTL? ((size / (-2 * gridSize[litem])) + "%") : '0',
-							borderCollapse: 'collapse'
-						}).find("td").click(function(e){
-								var $t = $(this),
-									h = $t.html(),
-									n = parseInt(h.replace(/[^0-9]/g),10),
-									ap = h.replace(/[^apm]/ig),
-									f = $t.data('for'); // loses scope, so we use data-for
-
-								if(f == 'hour'){
-									if(ap.indexOf('p') !== -1 && n < 12){
-										n += 12;
-									}
-									else{
-										if(ap.indexOf('a') !== -1 && n === 12){
-											n = 0;
-										}
-									}
-								}
-								
-								tp_inst.control.value(tp_inst, tp_inst[f+'_slider'], litem, n);
-
-								tp_inst._onTimeChange();
-								tp_inst._onSelectHandler();
-							})
-						.css({
-								cursor: 'pointer',
-								width: (100 / gridSize[litem]) + '%',
-								textAlign: 'center',
-								overflow: 'hidden'
-							});
-					} // end if grid > 0
-				} // end for loop
-
-				// Add timezone options
-				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
-				$.fn.append.apply(this.timezone_select,
-				$.map(o.timezoneList, function(val, idx) {
-					return $("<option />").val(typeof val == "object" ? val.value : val).text(typeof val == "object" ? val.label : val);
-				}));
-				if (typeof(this.timezone) != "undefined" && this.timezone !== null && this.timezone !== "") {
-					var local_date = new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12);
-					var local_timezone = $.timepicker.timeZoneOffsetString(local_date);
-					if (local_timezone == this.timezone) {
-						selectLocalTimeZone(tp_inst);
-					} else {
-						this.timezone_select.val(this.timezone);
-					}
-				} else {
-					if (typeof(this.hour) != "undefined" && this.hour !== null && this.hour !== "") {
-						this.timezone_select.val(o.defaultTimezone);
-					} else {
-						selectLocalTimeZone(tp_inst);
-					}
-				}
-				this.timezone_select.change(function() {
-					tp_inst._defaults.useLocalTimezone = false;
-					tp_inst._onTimeChange();
-					tp_inst._onSelectHandler();
-				});
-				// End timezone options
-				
-				// inject timepicker into datepicker
-				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
-				if ($buttonPanel.length) {
-					$buttonPanel.before($tp);
-				} else {
-					$dp.append($tp);
-				}
-
-				this.$timeObj = $tp.find('.ui_tpicker_time');
-
-				if (this.inst !== null) {
-					var timeDefined = this.timeDefined;
-					this._onTimeChange();
-					this.timeDefined = timeDefined;
-				}
-
-				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
-				if (this._defaults.addSliderAccess) {
-					var sliderAccessArgs = this._defaults.sliderAccessArgs,
-						rtl = this._defaults.isRTL;
-					sliderAccessArgs.isRTL = rtl;
-						
-					setTimeout(function() { // fix for inline mode
-						if ($tp.find('.ui-slider-access').length === 0) {
-							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
-
-							// fix any grids since sliders are shorter
-							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
-							if (sliderAccessWidth) {
-								$tp.find('table:visible').each(function() {
-									var $g = $(this),
-										oldWidth = $g.outerWidth(),
-										oldMarginLeft = $g.css(rtl? 'marginRight':'marginLeft').toString().replace('%', ''),
-										newWidth = oldWidth - sliderAccessWidth,
-										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
-										css = { width: newWidth, marginRight: 0, marginLeft: 0 };
-									css[rtl? 'marginRight':'marginLeft'] = newMarginLeft;
-									$g.css(css);
-								});
-							}
-						}
-					}, 10);
-				}
-				// end slideAccess integration
-
-			}
-		},
-
-		/*
-		* This function tries to limit the ability to go outside the
-		* min/max date range
-		*/
-		_limitMinMaxDateTime: function(dp_inst, adjustSliders) {
-			var o = this._defaults,
-				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
-
-			if (!this._defaults.showTimepicker) {
-				return;
-			} // No time so nothing to check here
-
-			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
-				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
-					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
-
-				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null) {
-					this.hourMinOriginal = o.hourMin;
-					this.minuteMinOriginal = o.minuteMin;
-					this.secondMinOriginal = o.secondMin;
-					this.millisecMinOriginal = o.millisecMin;
-				}
-
-				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() == dp_date.getTime()) {
-					this._defaults.hourMin = minDateTime.getHours();
-					if (this.hour <= this._defaults.hourMin) {
-						this.hour = this._defaults.hourMin;
-						this._defaults.minuteMin = minDateTime.getMinutes();
-						if (this.minute <= this._defaults.minuteMin) {
-							this.minute = this._defaults.minuteMin;
-							this._defaults.secondMin = minDateTime.getSeconds();
-							if (this.second <= this._defaults.secondMin) {
-								this.second = this._defaults.secondMin;
-								this._defaults.millisecMin = minDateTime.getMilliseconds();
-							} else {
-								if (this.millisec < this._defaults.millisecMin) {
-									this.millisec = this._defaults.millisecMin;
-								}
-								this._defaults.millisecMin = this.millisecMinOriginal;
-							}
-						} else {
-							this._defaults.secondMin = this.secondMinOriginal;
-							this._defaults.millisecMin = this.millisecMinOriginal;
-						}
-					} else {
-						this._defaults.minuteMin = this.minuteMinOriginal;
-						this._defaults.secondMin = this.secondMinOriginal;
-						this._defaults.millisecMin = this.millisecMinOriginal;
-					}
-				} else {
-					this._defaults.hourMin = this.hourMinOriginal;
-					this._defaults.minuteMin = this.minuteMinOriginal;
-					this._defaults.secondMin = this.secondMinOriginal;
-					this._defaults.millisecMin = this.millisecMinOriginal;
-				}
-			}
-
-			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
-				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
-					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
-
-				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null) {
-					this.hourMaxOriginal = o.hourMax;
-					this.minuteMaxOriginal = o.minuteMax;
-					this.secondMaxOriginal = o.secondMax;
-					this.millisecMaxOriginal = o.millisecMax;
-				}
-
-				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() == dp_date.getTime()) {
-					this._defaults.hourMax = maxDateTime.getHours();
-					if (this.hour >= this._defaults.hourMax) {
-						this.hour = this._defaults.hourMax;
-						this._defaults.minuteMax = maxDateTime.getMinutes();
-						if (this.minute >= this._defaults.minuteMax) {
-							this.minute = this._defaults.minuteMax;
-							this._defaults.secondMax = maxDateTime.getSeconds();
-							if (this.second >= this._defaults.secondMax) {
-								this.second = this._defaults.secondMax;
-								this._defaults.millisecMax = maxDateTime.getMilliseconds();
-							} else {
-								if (this.millisec > this._defaults.millisecMax) {
-									this.millisec = this._defaults.millisecMax;
-								}
-								this._defaults.millisecMax = this.millisecMaxOriginal;
-							}
-						} else {
-							this._defaults.secondMax = this.secondMaxOriginal;
-							this._defaults.millisecMax = this.millisecMaxOriginal;
-						}
-					} else {
-						this._defaults.minuteMax = this.minuteMaxOriginal;
-						this._defaults.secondMax = this.secondMaxOriginal;
-						this._defaults.millisecMax = this.millisecMaxOriginal;
-					}
-				} else {
-					this._defaults.hourMax = this.hourMaxOriginal;
-					this._defaults.minuteMax = this.minuteMaxOriginal;
-					this._defaults.secondMax = this.secondMaxOriginal;
-					this._defaults.millisecMax = this.millisecMaxOriginal;
-				}
-			}
-
-			if (adjustSliders !== undefined && adjustSliders === true) {
-				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
-					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
-					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
-					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10);
-
-				if (this.hour_slider) {
-					this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax });
-					this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
-				}
-				if (this.minute_slider) {
-					this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax });
-					this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
-				}
-				if (this.second_slider) {
-					this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax });
-					this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
-				}
-				if (this.millisec_slider) {
-					this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax });
-					this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
-				}
-			}
-
-		},
-
-		/*
-		* when a slider moves, set the internal time...
-		* on time change is also called when the time is updated in the text field
-		*/
-		_onTimeChange: function() {
-			var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
-				minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
-				second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
-				millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
-				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
-				o = this._defaults,
-				pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
-				pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
-
-			if (typeof(hour) == 'object') {
-				hour = false;
-			}
-			if (typeof(minute) == 'object') {
-				minute = false;
-			}
-			if (typeof(second) == 'object') {
-				second = false;
-			}
-			if (typeof(millisec) == 'object') {
-				millisec = false;
-			}
-			if (typeof(timezone) == 'object') {
-				timezone = false;
-			}
-
-			if (hour !== false) {
-				hour = parseInt(hour, 10);
-			}
-			if (minute !== false) {
-				minute = parseInt(minute, 10);
-			}
-			if (second !== false) {
-				second = parseInt(second, 10);
-			}
-			if (millisec !== false) {
-				millisec = parseInt(millisec, 10);
-			}
-
-			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
-
-			// If the update was done in the input field, the input field should not be updated.
-			// If the update was done using the sliders, update the input field.
-			var hasChanged = (hour != this.hour || minute != this.minute || second != this.second || millisec != this.millisec 
-								|| (this.ampm.length > 0 && (hour < 12) != ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) 
-								|| ((this.timezone === null && timezone != this.defaultTimezone) || (this.timezone !== null && timezone != this.timezone)));
-
-			if (hasChanged) {
-
-				if (hour !== false) {
-					this.hour = hour;
-				}
-				if (minute !== false) {
-					this.minute = minute;
-				}
-				if (second !== false) {
-					this.second = second;
-				}
-				if (millisec !== false) {
-					this.millisec = millisec;
-				}
-				if (timezone !== false) {
-					this.timezone = timezone;
-				}
-
-				if (!this.inst) {
-					this.inst = $.datepicker._getInst(this.$input[0]);
-				}
-
-				this._limitMinMaxDateTime(this.inst, true);
-			}
-			if (useAmpm(o.timeFormat)) {
-				this.ampm = ampm;
-			}
-
-			// Updates the time within the timepicker
-			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
-			if (this.$timeObj) {
-				if(pickerTimeFormat === o.timeFormat){
-					this.$timeObj.text(this.formattedTime + pickerTimeSuffix);
-				}
-				else{
-					this.$timeObj.text($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
-				}
-			}
-
-			this.timeDefined = true;
-			if (hasChanged) {
-				this._updateDateTime();
-			}
-		},
-
-		/*
-		* call custom onSelect.
-		* bind to sliders slidestop, and grid click.
-		*/
-		_onSelectHandler: function() {
-			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
-			var inputEl = this.$input ? this.$input[0] : null;
-			if (onSelect && inputEl) {
-				onSelect.apply(inputEl, [this.formattedDateTime, this]);
-			}
-		},
-
-		/*
-		* update our input with the new date time..
-		*/
-		_updateDateTime: function(dp_inst) {
-			dp_inst = this.inst || dp_inst;
-			var dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
-				formatCfg = $.datepicker._getFormatConfig(dp_inst),
-				timeAvailable = dt !== null && this.timeDefined;
-			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
-			var formattedDateTime = this.formattedDate;
-
-			/*
-			* remove following lines to force every changes in date picker to change the input value
-			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
-			* If the user manually empty the value in the input field, the date picker will never change selected value.
-			*/
-			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
-			//	return;
-			//}
-
-			if (this._defaults.timeOnly === true) {
-				formattedDateTime = this.formattedTime;
-			} else if (this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) {
-				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
-			}
-
-			this.formattedDateTime = formattedDateTime;
-
-			if (!this._defaults.showTimepicker) {
-				this.$input.val(this.formattedDate);
-			} else if (this.$altInput && this._defaults.altFieldTimeOnly === true) {
-				this.$altInput.val(this.formattedTime);
-				this.$input.val(this.formattedDate);
-			} else if (this.$altInput) {
-				this.$input.val(formattedDateTime);
-				var altFormattedDateTime = '',
-					altSeparator = this._defaults.altSeparator ? this._defaults.altSeparator : this._defaults.separator,
-					altTimeSuffix = this._defaults.altTimeSuffix ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
-
-				if (this._defaults.altFormat) altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
-				else altFormattedDateTime = this.formattedDate;
-				if (altFormattedDateTime) altFormattedDateTime += altSeparator;
-				if (this._defaults.altTimeFormat) altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
-				else altFormattedDateTime += this.formattedTime + altTimeSuffix;
-				this.$altInput.val(altFormattedDateTime);
-			} else {
-				this.$input.val(formattedDateTime);
-			}
-
-			this.$input.trigger("change");
-		},
-
-		_onFocus: function() {
-			if (!this.$input.val() && this._defaults.defaultValue) {
-				this.$input.val(this._defaults.defaultValue);
-				var inst = $.datepicker._getInst(this.$input.get(0)),
-					tp_inst = $.datepicker._get(inst, 'timepicker');
-				if (tp_inst) {
-					if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
-						try {
-							$.datepicker._updateDatepicker(inst);
-						} catch (err) {
-							$.datepicker.log(err);
-						}
-					}
-				}
-			}
-		},
-
-		/*
-		* Small abstraction to control types
-		* We can add more, just be sure to follow the pattern: create, options, value
-		*/
-		_controls: {
-			// slider methods
-			slider: {
-				create: function(tp_inst, obj, unit, val, min, max, step){
-					var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
-					return obj.prop('slide', null).slider({
-						orientation: "horizontal",
-						value: rtl? val*-1 : val,
-						min: rtl? max*-1 : min,
-						max: rtl? min*-1 : max,
-						step: step,
-						slide: function(event, ui) {
-							tp_inst.control.value(tp_inst, $(this), unit, rtl? ui.value*-1:ui.value);
-							tp_inst._onTimeChange();
-						},
-						stop: function(event, ui) {
-							tp_inst._onSelectHandler();
-						}
-					});	
-				},
-				options: function(tp_inst, obj, unit, opts, val){
-					if(tp_inst._defaults.isRTL){
-						if(typeof(opts) == 'string'){
-							if(opts == 'min' || opts == 'max'){
-								if(val !== undefined)
-									return obj.slider(opts, val*-1);
-								return Math.abs(obj.slider(opts));
-							}
-							return obj.slider(opts);
-						}
-						var min = opts.min, 
-							max = opts.max;
-						opts.min = opts.max = null;
-						if(min !== undefined)
-							opts.max = min * -1;
-						if(max !== undefined)
-							opts.min = max * -1;
-						return obj.slider(opts);
-					}
-					if(typeof(opts) == 'string' && val !== undefined)
-							return obj.slider(opts, val);
-					return obj.slider(opts);
-				},
-				value: function(tp_inst, obj, unit, val){
-					if(tp_inst._defaults.isRTL){
-						if(val !== undefined)
-							return obj.slider('value', val*-1);
-						return Math.abs(obj.slider('value'));
-					}
-					if(val !== undefined)
-						return obj.slider('value', val);
-					return obj.slider('value');
-				}
-			},
-			// select methods
-			select: {
-				create: function(tp_inst, obj, unit, val, min, max, step){
-					var sel = '<select class="ui-timepicker-select" data-unit="'+ unit +'" data-min="'+ min +'" data-max="'+ max +'" data-step="'+ step +'">',
-						ul = tp_inst._defaults.timeFormat.indexOf('t') !== -1? 'toLowerCase':'toUpperCase',
-						m = 0;
-
-					for(var i=min; i<=max; i+=step){						
-						sel += '<option value="'+ i +'"'+ (i==val? ' selected':'') +'>';
-						if(unit == 'hour' && useAmpm(tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat))
-							sel += $.datepicker.formatTime("hh TT", {hour:i}, tp_inst._defaults);
-						else if(unit == 'millisec' || i >= 10) sel += i;
-						else sel += '0'+ i.toString();
-						sel += '</option>';
-					}
-					sel += '</select>';
-
-					obj.children('select').remove();
-
-					$(sel).appendTo(obj).change(function(e){
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-					});
-
-					return obj;
-				},
-				options: function(tp_inst, obj, unit, opts, val){
-					var o = {},
-						$t = obj.children('select');
-					if(typeof(opts) == 'string'){
-						if(val === undefined)
-							return $t.data(opts);
-						o[opts] = val;	
-					}
-					else o = opts;
-					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min || $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
-				},
-				value: function(tp_inst, obj, unit, val){
-					var $t = obj.children('select');
-					if(val !== undefined)
-						return $t.val(val);
-					return $t.val();
-				}
-			}
-		} // end _controls
-
-	});
-
-	$.fn.extend({
-		/*
-		* shorthand just to use timepicker..
-		*/
-		timepicker: function(o) {
-			o = o || {};
-			var tmp_args = Array.prototype.slice.call(arguments);
-
-			if (typeof o == 'object') {
-				tmp_args[0] = $.extend(o, {
-					timeOnly: true
-				});
-			}
-
-			return $(this).each(function() {
-				$.fn.datetimepicker.apply($(this), tmp_args);
-			});
-		},
-
-		/*
-		* extend timepicker to datepicker
-		*/
-		datetimepicker: function(o) {
-			o = o || {};
-			var tmp_args = arguments;
-
-			if (typeof(o) == 'string') {
-				if (o == 'getDate') {
-					return $.fn.datepicker.apply($(this[0]), tmp_args);
-				} else {
-					return this.each(function() {
-						var $t = $(this);
-						$t.datepicker.apply($t, tmp_args);
-					});
-				}
-			} else {
-				return this.each(function() {
-					var $t = $(this);
-					$t.datepicker($.timepicker._newInst($t, o)._defaults);
-				});
-			}
-		}
-	});
-
-	/*
-	* Public Utility to parse date and time
-	*/
-	$.datepicker.parseDateTime = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
-		if (parseRes.timeObj) {
-			var t = parseRes.timeObj;
-			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
-		}
-
-		return parseRes.date;
-	};
-
-	/*
-	* Public utility to parse time
-	*/
-	$.datepicker.parseTime = function(timeFormat, timeString, options) {		
-		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {});
-
-		// Strict parse requires the timeString to match the timeFormat exactly
-		var strictParse = function(f, s, o){
-
-			// pattern for standard and localized AM/PM markers
-			var getPatternAmpm = function(amNames, pmNames) {
-				var markers = [];
-				if (amNames) {
-					$.merge(markers, amNames);
-				}
-				if (pmNames) {
-					$.merge(markers, pmNames);
-				}
-				markers = $.map(markers, function(val) {
-					return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
-				});
-				return '(' + markers.join('|') + ')?';
-			};
-
-			// figure out position of time elements.. cause js cant do named captures
-			var getFormatPositions = function(timeFormat) {
-				var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|t{1,2}|z|'.*?')/g),
-					orders = {
-						h: -1,
-						m: -1,
-						s: -1,
-						l: -1,
-						t: -1,
-						z: -1
-					};
-
-				if (finds) {
-					for (var i = 0; i < finds.length; i++) {
-						if (orders[finds[i].toString().charAt(0)] == -1) {
-							orders[finds[i].toString().charAt(0)] = i + 1;
-						}
-					}
-				}
-				return orders;
-			};
-
-			var regstr = '^' + f.toString()
-					.replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[lz]|'.*?')/g, function (match) {
-							var ml = match.length;
-							switch (match.charAt(0).toLowerCase()) {
-								case 'h': return ml === 1? '(\\d?\\d)':'(\\d{'+ml+'})';
-								case 'm': return ml === 1? '(\\d?\\d)':'(\\d{'+ml+'})';
-								case 's': return ml === 1? '(\\d?\\d)':'(\\d{'+ml+'})';
-								case 'l': return '(\\d?\\d?\\d)';
-								case 'z': return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
-								case 't': return getPatternAmpm(o.amNames, o.pmNames);
-								default:    // literal escaped in quotes
-									return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
-							}
-						})
-					.replace(/\s/g, '\\s?') +
-					o.timeSuffix + '$',
-				order = getFormatPositions(f),
-				ampm = '',
-				treg;
-
-			treg = s.match(new RegExp(regstr, 'i'));
-
-			var resTime = {
-				hour: 0,
-				minute: 0,
-				second: 0,
-				millisec: 0
-			};
-
-			if (treg) {
-				if (order.t !== -1) {
-					if (treg[order.t] === undefined || treg[order.t].length === 0) {
-						ampm = '';
-						resTime.ampm = '';
-					} else {
-						ampm = $.inArray(treg[order.t].toUpperCase(), o.amNames) !== -1 ? 'AM' : 'PM';
-						resTime.ampm = o[ampm == 'AM' ? 'amNames' : 'pmNames'][0];
-					}
-				}
-
-				if (order.h !== -1) {
-					if (ampm == 'AM' && treg[order.h] == '12') {
-						resTime.hour = 0; // 12am = 0 hour
-					} else {
-						if (ampm == 'PM' && treg[order.h] != '12') {
-							resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
-						} else {
-							resTime.hour = Number(treg[order.h]);
-						}
-					}
-				}
-
-				if (order.m !== -1) {
-					resTime.minute = Number(treg[order.m]);
-				}
-				if (order.s !== -1) {
-					resTime.second = Number(treg[order.s]);
-				}
-				if (order.l !== -1) {
-					resTime.millisec = Number(treg[order.l]);
-				}
-				if (order.z !== -1 && treg[order.z] !== undefined) {
-					var tz = treg[order.z].toUpperCase();
-					switch (tz.length) {
-					case 1:
-						// Z
-						tz = o.timezoneIso8601 ? 'Z' : '+0000';
-						break;
-					case 5:
-						// +hhmm
-						if (o.timezoneIso8601) {
-							tz = tz.substring(1) == '0000' ? 'Z' : tz.substring(0, 3) + ':' + tz.substring(3);
-						}
-						break;
-					case 6:
-						// +hh:mm
-						if (!o.timezoneIso8601) {
-							tz = tz == 'Z' || tz.substring(1) == '00:00' ? '+0000' : tz.replace(/:/, '');
-						} else {
-							if (tz.substring(1) == '00:00') {
-								tz = 'Z';
-							}
-						}
-						break;
-					}
-					resTime.timezone = tz;
-				}
-
-
-				return resTime;
-			}
-			return false;
-		};// end strictParse
-
-		// First try JS Date, if that fails, use strictParse
-		var looseParse = function(f,s,o){
-			try{
-				var d = new Date('2012-01-01 '+ s);
-				if(isNaN(d.getTime())){
-					d = new Date('2012-01-01T'+ s);
-					if(isNaN(d.getTime())){
-						d = new Date('01/01/2012 '+ s);
-						if(isNaN(d.getTime())){
-							throw "Unable to parse time with native Date: "+ s;
-						}
-					}
-				}
-
-				return {
-					hour: d.getHours(),
-					minute: d.getMinutes(),
-					second: d.getSeconds(),
-					millisec: d.getMilliseconds(),
-					timezone: $.timepicker.timeZoneOffsetString(d)
-				};
-			}
-			catch(err){
-				try{
-					return strictParse(f,s,o);
-				}
-				catch(err2){
-					$.datepicker.log("Unable to parse \ntimeString: "+ s +"\ntimeFormat: "+ f);
-				}				
-			}
-			return false;
-		}; // end looseParse
-		
-		if(typeof o.parse === "function"){
-			return o.parse(timeFormat, timeString, o)
-		}
-		if(o.parse === 'loose'){
-			return looseParse(timeFormat, timeString, o);
-		}
-		return strictParse(timeFormat, timeString, o);
-	};
-
-	/*
-	* Public utility to format the time
-	* format = string format of the time
-	* time = a {}, not a Date() for timezones
-	* options = essentially the regional[].. amNames, pmNames, ampm
-	*/
-	$.datepicker.formatTime = function(format, time, options) {
-		options = options || {};
-		options = $.extend({}, $.timepicker._defaults, options);
-		time = $.extend({
-			hour: 0,
-			minute: 0,
-			second: 0,
-			millisec: 0,
-			timezone: '+0000'
-		}, time);
-
-		var tmptime = format,
-			ampmName = options.amNames[0],
-			hour = parseInt(time.hour, 10);
-
-		if (hour > 11) {
-			ampmName = options.pmNames[0];
-		}
-
-		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[lz]|('.*?'|".*?"))/g, function(match) {
-		switch (match) {
-			case 'HH':
-				return ('0' + hour).slice(-2);
-			case 'H':
-				return hour;
-			case 'hh':
-				return ('0' + convert24to12(hour)).slice(-2);
-			case 'h':
-				return convert24to12(hour);
-			case 'mm':
-				return ('0' + time.minute).slice(-2);
-			case 'm':
-				return time.minute;
-			case 'ss':
-				return ('0' + time.second).slice(-2);
-			case 's':
-				return time.second;
-			case 'l':
-				return ('00' + time.millisec).slice(-3);
-			case 'z':
-				return time.timezone === null? options.defaultTimezone : time.timezone;
-			case 'T': 
-				return ampmName.charAt(0).toUpperCase();
-			case 'TT': 
-				return ampmName.toUpperCase();
-			case 't':
-				return ampmName.charAt(0).toLowerCase();
-			case 'tt':
-				return ampmName.toLowerCase();
-			default:
-				return match.replace(/\'/g, "") || "'";
-			}
-		});
-
-		tmptime = $.trim(tmptime);
-		return tmptime;
-	};
-
-	/*
-	* the bad hack :/ override datepicker so it doesnt close on select
-	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
-	*/
-	$.datepicker._base_selectDate = $.datepicker._selectDate;
-	$.datepicker._selectDate = function(id, dateStr) {
-		var inst = this._getInst($(id)[0]),
-			tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			tp_inst._limitMinMaxDateTime(inst, true);
-			inst.inline = inst.stay_open = true;
-			//This way the onSelect handler called from calendarpicker get the full dateTime
-			this._base_selectDate(id, dateStr);
-			inst.inline = inst.stay_open = false;
-			this._notifyChange(inst);
-			this._updateDatepicker(inst);
-		} else {
-			this._base_selectDate(id, dateStr);
-		}
-	};
-
-	/*
-	* second bad hack :/ override datepicker so it triggers an event when changing the input field
-	* and does not redraw the datepicker on every selectDate event
-	*/
-	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
-	$.datepicker._updateDatepicker = function(inst) {
-
-		// don't popup the datepicker if there is another instance already opened
-		var input = inst.input[0];
-		if ($.datepicker._curInst && $.datepicker._curInst != inst && $.datepicker._datepickerShowing && $.datepicker._lastInput != input) {
-			return;
-		}
-
-		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-
-			this._base_updateDatepicker(inst);
-
-			// Reload the time control when changing something in the input text field.
-			var tp_inst = this._get(inst, 'timepicker');
-			if (tp_inst) {
-				tp_inst._addTimePicker(inst);
-
-//				if (tp_inst._defaults.useLocalTimezone) { //checks daylight saving with the new date.
-//					var date = new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay, 12);
-//					selectLocalTimeZone(tp_inst, date);
-//					tp_inst._onTimeChange();
-//				}
-			}
-		}
-	};
-
-	/*
-	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
-	*/
-	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
-	$.datepicker._doKeyPress = function(event) {
-		var inst = $.datepicker._getInst(event.target),
-			tp_inst = $.datepicker._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			if ($.datepicker._get(inst, 'constrainInput')) {
-				var ampm = useAmpm(tp_inst._defaults.timeFormat),
-					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
-					datetimeChars = tp_inst._defaults.timeFormat.toString()
-											.replace(/[hms]/g, '')
-											.replace(/TT/g, ampm ? 'APM' : '')
-											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
-											.replace(/tT/g, ampm ? 'AaPpMm' : '')
-											.replace(/T/g, ampm ? 'AP' : '')
-											.replace(/tt/g, ampm ? 'apm' : '')
-											.replace(/t/g, ampm ? 'ap' : '') + 
-											" " + tp_inst._defaults.separator + 
-											tp_inst._defaults.timeSuffix + 
-											(tp_inst._defaults.showTimezone ? tp_inst._defaults.timezoneList.join('') : '') + 
-											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + 
-											dateChars,
-					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
-				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
-			}
-		}
-
-		return $.datepicker._base_doKeyPress(event);
-	};
-
-	/*
-	* Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
-	*/
-	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
-	/* Update any alternate field to synchronise with the main field. */
-	$.datepicker._updateAlternate = function(inst) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if(tp_inst){
-			var altField = tp_inst._defaults.altField;
-			if (altField) { // update alternate field too
-				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
-					date = this._getDate(inst),
-					formatCfg = $.datepicker._getFormatConfig(inst),
-					altFormattedDateTime = '', 
-					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 
-					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
-					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
-				
-				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
-				if(!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null){
-					if(tp_inst._defaults.altFormat)
-						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
-					else altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
-				}
-				$(altField).val(altFormattedDateTime);
-			}
-		}
-		else{
-			$.datepicker._base_updateAlternate(inst);
-		}
-	};
-
-	/*
-	* Override key up event to sync manual input changes.
-	*/
-	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
-	$.datepicker._doKeyUp = function(event) {
-		var inst = $.datepicker._getInst(event.target),
-			tp_inst = $.datepicker._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			if (tp_inst._defaults.timeOnly && (inst.input.val() != inst.lastVal)) {
-				try {
-					$.datepicker._updateDatepicker(inst);
-				} catch (err) {
-					$.datepicker.log(err);
-				}
-			}
-		}
-
-		return $.datepicker._base_doKeyUp(event);
-	};
-
-	/*
-	* override "Today" button to also grab the time.
-	*/
-	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
-	$.datepicker._gotoToday = function(id) {
-		var inst = this._getInst($(id)[0]),
-			$dp = inst.dpDiv;
-		this._base_gotoToday(id);
-		var tp_inst = this._get(inst, 'timepicker');
-		selectLocalTimeZone(tp_inst);
-		var now = new Date();
-		this._setTime(inst, now);
-		$('.ui-datepicker-today', $dp).click();
-	};
-
-	/*
-	* Disable & enable the Time in the datetimepicker
-	*/
-	$.datepicker._disableTimepickerDatepicker = function(target) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-		if (tp_inst) {
-			tp_inst._defaults.showTimepicker = false;
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	$.datepicker._enableTimepickerDatepicker = function(target) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-		if (tp_inst) {
-			tp_inst._defaults.showTimepicker = true;
-			tp_inst._addTimePicker(inst); // Could be disabled on page load
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	/*
-	* Create our own set time function
-	*/
-	$.datepicker._setTime = function(inst, date) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var defaults = tp_inst._defaults;
-
-			// calling _setTime with no date sets time to defaults
-			tp_inst.hour = date ? date.getHours() : defaults.hour;
-			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
-			tp_inst.second = date ? date.getSeconds() : defaults.second;
-			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
-
-			//check if within min/max times.. 
-			tp_inst._limitMinMaxDateTime(inst, true);
-
-			tp_inst._onTimeChange();
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	/*
-	* Create new public method to set only time, callable as $().datepicker('setTime', date)
-	*/
-	$.datepicker._setTimeDatepicker = function(target, date, withDate) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			this._setDateFromField(inst);
-			var tp_date;
-			if (date) {
-				if (typeof date == "string") {
-					tp_inst._parseTime(date, withDate);
-					tp_date = new Date();
-					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-				} else {
-					tp_date = new Date(date.getTime());
-				}
-				if (tp_date.toString() == 'Invalid Date') {
-					tp_date = undefined;
-				}
-				this._setTime(inst, tp_date);
-			}
-		}
-
-	};
-
-	/*
-	* override setDate() to allow setting time too within Date object
-	*/
-	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
-	$.datepicker._setDateDatepicker = function(target, date) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_date = (date instanceof Date) ? new Date(date.getTime()) : date;
-
-		this._updateDatepicker(inst);
-		this._base_setDateDatepicker.apply(this, arguments);
-		this._setTimeDatepicker(target, tp_date, true);
-	};
-
-	/*
-	* override getDate() to allow getting time too within Date object
-	*/
-	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
-	$.datepicker._getDateDatepicker = function(target, noDefault) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			// if it hasn't yet been defined, grab from field
-			if(inst.lastVal === undefined){
-				this._setDateFromField(inst, noDefault);
-			}
-
-			var date = this._getDate(inst);
-			if (date && tp_inst._parseTime($(target).val(), tp_inst.timeOnly)) {
-				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-			}
-			return date;
-		}
-		return this._base_getDateDatepicker(target, noDefault);
-	};
-
-	/*
-	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
-	* An option in datapicker to ignore extra format characters would be nicer.
-	*/
-	$.datepicker._base_parseDate = $.datepicker.parseDate;
-	$.datepicker.parseDate = function(format, value, settings) {
-		var date;
-		try {
-			date = this._base_parseDate(format, value, settings);
-		} catch (err) {
-			// Hack!  The error message ends with a colon, a space, and
-			// the "extra" characters.  We rely on that instead of
-			// attempting to perfectly reproduce the parsing algorithm.
-			date = this._base_parseDate(format, value.substring(0,value.length-(err.length-err.indexOf(':')-2)), settings);
-			$.datepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
-		}
-		return date;
-	};
-
-	/*
-	* override formatDate to set date with time to the input
-	*/
-	$.datepicker._base_formatDate = $.datepicker._formatDate;
-	$.datepicker._formatDate = function(inst, day, month, year) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			tp_inst._updateDateTime(inst);
-			return tp_inst.$input.val();
-		}
-		return this._base_formatDate(inst);
-	};
-
-	/*
-	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
-	*/
-	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
-	$.datepicker._optionDatepicker = function(target, name, value) {
-		var inst = this._getInst(target),
-	        name_clone;
-		if (!inst) {
-			return null;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var min = null,
-				max = null,
-				onselect = null,
-				overrides = tp_inst._defaults.evnts,
-				fns = {},
-				prop;
-		    if (typeof name == 'string') { // if min/max was set with the string
-		        if (name === 'minDate' || name === 'minDateTime') {
-		            min = value;
-		        } else if (name === 'maxDate' || name === 'maxDateTime') {
-		            max = value;
-		        } else if (name === 'onSelect') {
-		            onselect = value;
-		        } else if (overrides.hasOwnProperty(name)) {
-		            if (typeof (value) === 'undefined') {
-		                return overrides[name];
-		            }
-		            fns[name] = value;
-		            name_clone = {}; //empty results in exiting function after overrides updated
-		        }
-		    } else if (typeof name == 'object') { //if min/max was set with the JSON
-		        if (name.minDate) {
-		            min = name.minDate;
-		        } else if (name.minDateTime) {
-		            min = name.minDateTime;
-		        } else if (name.maxDate) {
-		            max = name.maxDate;
-		        } else if (name.maxDateTime) {
-		            max = name.maxDateTime;
-		        }
-		        for (prop in overrides) {
-		            if (overrides.hasOwnProperty(prop) && name[prop]) {
-		                fns[prop] = name[prop];
-		            }
-		        }
-		    }
-		    for (prop in fns) {
-		        if (fns.hasOwnProperty(prop)) {
-		            overrides[prop] = fns[prop];
-		            if (!name_clone) { name_clone = $.extend({}, name);}
-		            delete name_clone[prop];
-		        }
-		    }
-		    if (name_clone && isEmptyObject(name_clone)) { return; }
-		    if (min) { //if min was set
-		        if (min === 0) {
-		            min = new Date();
-		        } else {
-		            min = new Date(min);
-		        }
-		        tp_inst._defaults.minDate = min;
-		        tp_inst._defaults.minDateTime = min;
-		    } else if (max) { //if max was set
-		        if (max === 0) {
-		            max = new Date();
-		        } else {
-		            max = new Date(max);
-		        }
-		        tp_inst._defaults.maxDate = max;
-		        tp_inst._defaults.maxDateTime = max;
-		    } else if (onselect) {
-		        tp_inst._defaults.onSelect = onselect;
-		    }
-		}
-		if (value === undefined) {
-			return this._base_optionDatepicker.call($.datepicker, target, name);
-		}
-		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
-	};
-	/*
-	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
-	* it will return false for all objects
-	*/
-	var isEmptyObject = function(obj) {
-		var prop;
-		for (prop in obj) {
-			if (obj.hasOwnProperty(obj)) {
-				return false;
-			}
-		}
-		return true;
-	};
-
-	/*
-	* jQuery extend now ignores nulls!
-	*/
-	var extendRemove = function(target, props) {
-		$.extend(target, props);
-		for (var name in props) {
-			if (props[name] === null || props[name] === undefined) {
-				target[name] = props[name];
-			}
-		}
-		return target;
-	};
-
-	/*
-	* Determine by the time format if should use ampm
-	* Returns true if should use ampm, false if not
-	*/
-	var useAmpm = function(timeFormat){
-		return (timeFormat.indexOf('t') !== -1 && timeFormat.indexOf('h') !== -1);
-	};
-
-	/*
-	* Converts 24 hour format into 12 hour
-	* Returns 12 hour without leading 0
-	*/
-	var convert24to12 = function(hour) {
-		if (hour > 12) {
-			hour = hour - 12;
-		}
-
-		if (hour == 0) {
-			hour = 12;
-		}
-
-		return String(hour);
-	};
-
-	/*
-	* Splits datetime string into date ans time substrings.
-	* Throws exception when date can't be parsed
-	* Returns [dateString, timeString]
-	*/
-	var splitDateTime = function(dateFormat, dateTimeString, dateSettings, timeSettings) {
-		try {
-			// The idea is to get the number separator occurances in datetime and the time format requested (since time has 
-			// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
-			var separator = timeSettings && timeSettings.separator ? timeSettings.separator : $.timepicker._defaults.separator,
-				format = timeSettings && timeSettings.timeFormat ? timeSettings.timeFormat : $.timepicker._defaults.timeFormat,
-				timeParts = format.split(separator), // how many occurances of separator may be in our format?
-				timePartsLen = timeParts.length,
-				allParts = dateTimeString.split(separator),
-				allPartsLen = allParts.length;
-
-			if (allPartsLen > 1) {
-				return [
-						allParts.splice(0,allPartsLen-timePartsLen).join(separator),
-						allParts.splice(0,timePartsLen).join(separator)
-					];
-			}
-
-		} catch (err) {
-			$.datepicker.log('Could not split the date from the time. Please check the following datetimepicker options' +
-					"\nthrown error: " + err +
-					"\ndateTimeString" + dateTimeString +
-					"\ndateFormat = " + dateFormat +
-					"\nseparator = " + timeSettings.separator +
-					"\ntimeFormat = " + timeSettings.timeFormat);
-
-			if (err.indexOf(":") >= 0) {
-				// Hack!  The error message ends with a colon, a space, and
-				// the "extra" characters.  We rely on that instead of
-				// attempting to perfectly reproduce the parsing algorithm.
-				var dateStringLength = dateTimeString.length - (err.length - err.indexOf(':') - 2),
-					timeString = dateTimeString.substring(dateStringLength);
-
-				return [$.trim(dateTimeString.substring(0, dateStringLength)), $.trim(dateTimeString.substring(dateStringLength))];
-
-			} else {
-				throw err;
-			}
-		}
-		return [dateTimeString, ''];
-	};
-
-	/*
-	* Internal function to parse datetime interval
-	* Returns: {date: Date, timeObj: Object}, where
-	*   date - parsed date without time (type Date)
-	*   timeObj = {hour: , minute: , second: , millisec: } - parsed time. Optional
-	*/
-	var parseDateTimeInternal = function(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-		var date;
-		var splitRes = splitDateTime(dateFormat, dateTimeString, dateSettings, timeSettings);
-		date = $.datepicker._base_parseDate(dateFormat, splitRes[0], dateSettings);
-		if (splitRes[1] !== '') {
-			var timeString = splitRes[1],
-				parsedTime = $.datepicker.parseTime(timeFormat, timeString, timeSettings);
-
-			if (parsedTime === null) {
-				throw 'Wrong time format';
-			}
-			return {
-				date: date,
-				timeObj: parsedTime
-			};
-		} else {
-			return {
-				date: date
-			};
-		}
-	};
-
-	/*
-	* Internal function to set timezone_select to the local timezone
-	*/
-	var selectLocalTimeZone = function(tp_inst, date) {
-		if (tp_inst && tp_inst.timezone_select) {
-			tp_inst._defaults.useLocalTimezone = true;
-			var now = typeof date !== 'undefined' ? date : new Date();
-			var tzoffset = $.timepicker.timeZoneOffsetString(now);
-			if (tp_inst._defaults.timezoneIso8601) {
-				tzoffset = tzoffset.substring(0, 3) + ':' + tzoffset.substring(3);
-			}
-			tp_inst.timezone_select.val(tzoffset);
-		}
-	};
-
-	/*
-	* Create a Singleton Insance
-	*/
-	$.timepicker = new Timepicker();
-
-	/**
-	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
-	 * @param  date
-	 * @return string
-	 */
-	$.timepicker.timeZoneOffsetString = function(date) {
-		var off = date.getTimezoneOffset() * -1,
-			minutes = off % 60,
-			hours = (off - minutes) / 60;
-		return (off >= 0 ? '+' : '-') + ('0' + (hours * 101).toString()).slice(-2) + ('0' + (minutes * 101).toString()).slice(-2);
-	};
-
-	/**
-	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * n.b. The input value must be correctly formatted (reformatting is not supported)
-	 * @param  Element startTime
-	 * @param  Element endTime
-	 * @param  obj options Options for the timepicker() call
-	 * @return jQuery
-	 */
-	$.timepicker.timeRange = function(startTime, endTime, options) {
-		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  Element startTime
-	 * @param  Element endTime
-	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @param  string method Can be used to specify the type of picker to be added
-	 * @return jQuery
-	 */
-	$.timepicker.dateTimeRange = function(startTime, endTime, options) {
-		$.timepicker.dateRange(startTime, endTime, options, 'datetimepicker');
-	};
-
-	/**
-	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  Element startTime
-	 * @param  Element endTime
-	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @param  string method Can be used to specify the type of picker to be added
-	 * @return jQuery
-	 */
-	$.timepicker.dateRange = function(startTime, endTime, options, method) {
-		method = method || 'datepicker';
-		$.timepicker.handleRange(method, startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  string method Can be used to specify the type of picker to be added
-	 * @param  Element startTime
-	 * @param  Element endTime
-	 * @param  obj options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @return jQuery
-	 */
-	$.timepicker.handleRange = function(method, startTime, endTime, options) {
-		$.fn[method].call(startTime, $.extend({
-			onClose: function(dateText, inst) {
-				checkDates(this, endTime, dateText);
-			},
-			onSelect: function(selectedDateTime) {
-				selected(this, endTime, 'minDate');
-			}
-		}, options, options.start));
-		$.fn[method].call(endTime, $.extend({
-			onClose: function(dateText, inst) {
-				checkDates(this, startTime, dateText);
-			},
-			onSelect: function(selectedDateTime) {
-				selected(this, startTime, 'maxDate');
-			}
-		}, options, options.end));
-		// timepicker doesn't provide access to its 'timeFormat' option, 
-		// nor could I get datepicker.formatTime() to behave with times, so I
-		// have disabled reformatting for timepicker
-		if (method != 'timepicker' && options.reformat) {
-			$([startTime, endTime]).each(function() {
-				var format = $(this)[method].call($(this), 'option', 'dateFormat'),
-					date = new Date($(this).val());
-				if ($(this).val() && date) {
-					$(this).val($.datepicker.formatDate(format, date));
-				}
-			});
-		}
-		checkDates(startTime, endTime, startTime.val());
-
-		function checkDates(changed, other, dateText) {
-			if (other.val() && (new Date(startTime.val()) > new Date(endTime.val()))) {
-				other.val(dateText);
-			}
-		}
-		selected(startTime, endTime, 'minDate');
-		selected(endTime, startTime, 'maxDate');
-
-		function selected(changed, other, option) {
-			if (!$(changed).val()) {
-				return;
-			}
-			var date = $(changed)[method].call($(changed), 'getDate');
-			// timepicker doesn't implement 'getDate' and returns a jQuery
-			if (date.getTime) {
-				$(other)[method].call($(other), 'option', option, date);
-			}
-		}
-		return $([startTime.get(0), endTime.get(0)]);
-	};
-
-	/*
-	* Keep up with the version
-	*/
-	$.timepicker.version = "1.1.2";
-
-})(jQuery);
diff --git a/app/assets/javascripts/osem-datepickers.js b/app/assets/javascripts/osem-datepickers.js
index c26a93a3..efac362e 100644
--- a/app/assets/javascripts/osem-datepickers.js
+++ b/app/assets/javascripts/osem-datepickers.js
@@ -1,20 +1,47 @@
 $(function () {
   $("#registration-arrival-datepicker").datetimepicker({
       pickTime: true,
-      format: "YYYY-MM-DD hh:mm"
+      useCurrent: false,
+      minuteStepping: 15,
+      sideBySide: true,
+      format: "YYYY-MM-DD HH:mm"
   });
   $("#registration-departure-datepicker").datetimepicker({
       pickTime: true,
-      format: "YYYY-MM-DD hh:mm"
+      useCurrent: false,
+      minuteStepping: 15,
+      sideBySide: true,
+      format: "YYYY-MM-DD HH:mm"
   });
+  $("#registration-arrival-datepicker").on("dp.change",function (e) {
+      console.log (e.date)
+      $('#registration-departure-datepicker').data("DateTimePicker").setDate(e.date);
+      $('#registration-departure-datepicker').data("DateTimePicker").setMinDate(e.date);
+  });
+  $("#conference-end-datepicker").on("dp.change",function (e) {
+      $('#registration-arrival-datepicker').data("DateTimePicker").setMaxDate(e.date);
+  });
+
+
   $("#conference-start-datepicker").datetimepicker({
       pickTime: false,
+      useCurrent: false,
       format: "YYYY-MM-DD"
   });
   $("#conference-end-datepicker").datetimepicker({
       pickTime: false,
+      useCurrent: false,
       format: "YYYY-MM-DD"
   });
+  $("#conference-start-datepicker").on("dp.change",function (e) {
+      console.log (e.date)
+      $('#conference-end-datepicker').data("DateTimePicker").setDate(e.date);
+      $('#conference-end-datepicker').data("DateTimePicker").setMinDate(e.date);
+  });
+  $("#conference-end-datepicker").on("dp.change",function (e) {
+      $('#conference-start-datepicker').data("DateTimePicker").setMaxDate(e.date);
+  });
+
   $("#registration-period-start-datepicker").datetimepicker({
       format: "YYYY-MM-DD",
       pickTime: false,
@@ -25,6 +52,15 @@ $(function () {
       pickTime: false,
       pickSeconds: false
   });
+  $("#registration-period-start-datepicker").on("dp.change",function (e) {
+      console.log (e.date)
+      $('#registration-period-end-datepicker').data("DateTimePicker").setDate(e.date);
+      $('#registration-period-end-datepicker').data("DateTimePicker").setMinDate(e.date);
+  });
+  $("#registration-period-end-datepicker").on("dp.change",function (e) {
+      $('#registration-period-start-datepicker').data("DateTimePicker").setMaxDate(e.date);
+  });
+
   $(".target-due-date-datepicker").datetimepicker({
       pickTime: false,
       format: "YYYY-MM-DD"
diff --git a/app/assets/javascripts/waypoints.js b/app/assets/javascripts/waypoints.js
new file mode 100644
index 00000000..4f9a33b2
--- /dev/null
+++ b/app/assets/javascripts/waypoints.js
@@ -0,0 +1,517 @@
+// Generated by CoffeeScript 1.6.2
+/*!
+jQuery Waypoints - v2.0.5
+Copyright (c) 2011-2014 Caleb Troughton
+Licensed under the MIT license.
+https://github.com/imakewebthings/jquery-waypoints/blob/master/licenses.txt
+*/
+
+
+(function() {
+  var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
+    __slice = [].slice;
+
+  (function(root, factory) {
+    if (typeof define === 'function' && define.amd) {
+      return define('waypoints', ['jquery'], function($) {
+        return factory($, root);
+      });
+    } else {
+      return factory(root.jQuery, root);
+    }
+  })(window, function($, window) {
+    var $w, Context, Waypoint, allWaypoints, contextCounter, contextKey, contexts, isTouch, jQMethods, methods, resizeEvent, scrollEvent, waypointCounter, waypointKey, wp, wps;
+
+    $w = $(window);
+    isTouch = __indexOf.call(window, 'ontouchstart') >= 0;
+    allWaypoints = {
+      horizontal: {},
+      vertical: {}
+    };
+    contextCounter = 1;
+    contexts = {};
+    contextKey = 'waypoints-context-id';
+    resizeEvent = 'resize.waypoints';
+    scrollEvent = 'scroll.waypoints';
+    waypointCounter = 1;
+    waypointKey = 'waypoints-waypoint-ids';
+    wp = 'waypoint';
+    wps = 'waypoints';
+    Context = (function() {
+      function Context($element) {
+        var _this = this;
+
+        this.$element = $element;
+        this.element = $element[0];
+        this.didResize = false;
+        this.didScroll = false;
+        this.id = 'context' + contextCounter++;
+        this.oldScroll = {
+          x: $element.scrollLeft(),
+          y: $element.scrollTop()
+        };
+        this.waypoints = {
+          horizontal: {},
+          vertical: {}
+        };
+        this.element[contextKey] = this.id;
+        contexts[this.id] = this;
+        $element.bind(scrollEvent, function() {
+          var scrollHandler;
+
+          if (!(_this.didScroll || isTouch)) {
+            _this.didScroll = true;
+            scrollHandler = function() {
+              _this.doScroll();
+              return _this.didScroll = false;
+            };
+            return window.setTimeout(scrollHandler, $[wps].settings.scrollThrottle);
+          }
+        });
+        $element.bind(resizeEvent, function() {
+          var resizeHandler;
+
+          if (!_this.didResize) {
+            _this.didResize = true;
+            resizeHandler = function() {
+              $[wps]('refresh');
+              return _this.didResize = false;
+            };
+            return window.setTimeout(resizeHandler, $[wps].settings.resizeThrottle);
+          }
+        });
+      }
+
+      Context.prototype.doScroll = function() {
+        var axes,
+          _this = this;
+
+        axes = {
+          horizontal: {
+            newScroll: this.$element.scrollLeft(),
+            oldScroll: this.oldScroll.x,
+            forward: 'right',
+            backward: 'left'
+          },
+          vertical: {
+            newScroll: this.$element.scrollTop(),
+            oldScroll: this.oldScroll.y,
+            forward: 'down',
+            backward: 'up'
+          }
+        };
+        if (isTouch && (!axes.vertical.oldScroll || !axes.vertical.newScroll)) {
+          $[wps]('refresh');
+        }
+        $.each(axes, function(aKey, axis) {
+          var direction, isForward, triggered;
+
+          triggered = [];
+          isForward = axis.newScroll > axis.oldScroll;
+          direction = isForward ? axis.forward : axis.backward;
+          $.each(_this.waypoints[aKey], function(wKey, waypoint) {
+            var _ref, _ref1;
+
+            if ((axis.oldScroll < (_ref = waypoint.offset) && _ref <= axis.newScroll)) {
+              return triggered.push(waypoint);
+            } else if ((axis.newScroll < (_ref1 = waypoint.offset) && _ref1 <= axis.oldScroll)) {
+              return triggered.push(waypoint);
+            }
+          });
+          triggered.sort(function(a, b) {
+            return a.offset - b.offset;
+          });
+          if (!isForward) {
+            triggered.reverse();
+          }
+          return $.each(triggered, function(i, waypoint) {
+            if (waypoint.options.continuous || i === triggered.length - 1) {
+              return waypoint.trigger([direction]);
+            }
+          });
+        });
+        return this.oldScroll = {
+          x: axes.horizontal.newScroll,
+          y: axes.vertical.newScroll
+        };
+      };
+
+      Context.prototype.refresh = function() {
+        var axes, cOffset, isWin,
+          _this = this;
+
+        isWin = $.isWindow(this.element);
+        cOffset = this.$element.offset();
+        this.doScroll();
+        axes = {
+          horizontal: {
+            contextOffset: isWin ? 0 : cOffset.left,
+            contextScroll: isWin ? 0 : this.oldScroll.x,
+            contextDimension: this.$element.width(),
+            oldScroll: this.oldScroll.x,
+            forward: 'right',
+            backward: 'left',
+            offsetProp: 'left'
+          },
+          vertical: {
+            contextOffset: isWin ? 0 : cOffset.top,
+            contextScroll: isWin ? 0 : this.oldScroll.y,
+            contextDimension: isWin ? $[wps]('viewportHeight') : this.$element.height(),
+            oldScroll: this.oldScroll.y,
+            forward: 'down',
+            backward: 'up',
+            offsetProp: 'top'
+          }
+        };
+        return $.each(axes, function(aKey, axis) {
+          return $.each(_this.waypoints[aKey], function(i, waypoint) {
+            var adjustment, elementOffset, oldOffset, _ref, _ref1;
+
+            adjustment = waypoint.options.offset;
+            oldOffset = waypoint.offset;
+            elementOffset = $.isWindow(waypoint.element) ? 0 : waypoint.$element.offset()[axis.offsetProp];
+            if ($.isFunction(adjustment)) {
+              adjustment = adjustment.apply(waypoint.element);
+            } else if (typeof adjustment === 'string') {
+              adjustment = parseFloat(adjustment);
+              if (waypoint.options.offset.indexOf('%') > -1) {
+                adjustment = Math.ceil(axis.contextDimension * adjustment / 100);
+              }
+            }
+            waypoint.offset = elementOffset - axis.contextOffset + axis.contextScroll - adjustment;
+            if ((waypoint.options.onlyOnScroll && (oldOffset != null)) || !waypoint.enabled) {
+              return;
+            }
+            if (oldOffset !== null && (oldOffset < (_ref = axis.oldScroll) && _ref <= waypoint.offset)) {
+              return waypoint.trigger([axis.backward]);
+            } else if (oldOffset !== null && (oldOffset > (_ref1 = axis.oldScroll) && _ref1 >= waypoint.offset)) {
+              return waypoint.trigger([axis.forward]);
+            } else if (oldOffset === null && axis.oldScroll >= waypoint.offset) {
+              return waypoint.trigger([axis.forward]);
+            }
+          });
+        });
+      };
+
+      Context.prototype.checkEmpty = function() {
+        if ($.isEmptyObject(this.waypoints.horizontal) && $.isEmptyObject(this.waypoints.vertical)) {
+          this.$element.unbind([resizeEvent, scrollEvent].join(' '));
+          return delete contexts[this.id];
+        }
+      };
+
+      return Context;
+
+    })();
+    Waypoint = (function() {
+      function Waypoint($element, context, options) {
+        var idList, _ref;
+
+        if (options.offset === 'bottom-in-view') {
+          options.offset = function() {
+            var contextHeight;
+
+            contextHeight = $[wps]('viewportHeight');
+            if (!$.isWindow(context.element)) {
+              contextHeight = context.$element.height();
+            }
+            return contextHeight - $(this).outerHeight();
+          };
+        }
+        this.$element = $element;
+        this.element = $element[0];
+        this.axis = options.horizontal ? 'horizontal' : 'vertical';
+        this.callback = options.handler;
+        this.context = context;
+        this.enabled = options.enabled;
+        this.id = 'waypoints' + waypointCounter++;
+        this.offset = null;
+        this.options = options;
+        context.waypoints[this.axis][this.id] = this;
+        allWaypoints[this.axis][this.id] = this;
+        idList = (_ref = this.element[waypointKey]) != null ? _ref : [];
+        idList.push(this.id);
+        this.element[waypointKey] = idList;
+      }
+
+      Waypoint.prototype.trigger = function(args) {
+        if (!this.enabled) {
+          return;
+        }
+        if (this.callback != null) {
+          this.callback.apply(this.element, args);
+        }
+        if (this.options.triggerOnce) {
+          return this.destroy();
+        }
+      };
+
+      Waypoint.prototype.disable = function() {
+        return this.enabled = false;
+      };
+
+      Waypoint.prototype.enable = function() {
+        this.context.refresh();
+        return this.enabled = true;
+      };
+
+      Waypoint.prototype.destroy = function() {
+        delete allWaypoints[this.axis][this.id];
+        delete this.context.waypoints[this.axis][this.id];
+        return this.context.checkEmpty();
+      };
+
+      Waypoint.getWaypointsByElement = function(element) {
+        var all, ids;
+
+        ids = element[waypointKey];
+        if (!ids) {
+          return [];
+        }
+        all = $.extend({}, allWaypoints.horizontal, allWaypoints.vertical);
+        return $.map(ids, function(id) {
+          return all[id];
+        });
+      };
+
+      return Waypoint;
+
+    })();
+    methods = {
+      init: function(f, options) {
+        var _ref;
+
+        options = $.extend({}, $.fn[wp].defaults, options);
+        if ((_ref = options.handler) == null) {
+          options.handler = f;
+        }
+        this.each(function() {
+          var $this, context, contextElement, _ref1;
+
+          $this = $(this);
+          contextElement = (_ref1 = options.context) != null ? _ref1 : $.fn[wp].defaults.context;
+          if (!$.isWindow(contextElement)) {
+            contextElement = $this.closest(contextElement);
+          }
+          contextElement = $(contextElement);
+          context = contexts[contextElement[0][contextKey]];
+          if (!context) {
+            context = new Context(contextElement);
+          }
+          return new Waypoint($this, context, options);
+        });
+        $[wps]('refresh');
+        return this;
+      },
+      disable: function() {
+        return methods._invoke.call(this, 'disable');
+      },
+      enable: function() {
+        return methods._invoke.call(this, 'enable');
+      },
+      destroy: function() {
+        return methods._invoke.call(this, 'destroy');
+      },
+      prev: function(axis, selector) {
+        return methods._traverse.call(this, axis, selector, function(stack, index, waypoints) {
+          if (index > 0) {
+            return stack.push(waypoints[index - 1]);
+          }
+        });
+      },
+      next: function(axis, selector) {
+        return methods._traverse.call(this, axis, selector, function(stack, index, waypoints) {
+          if (index < waypoints.length - 1) {
+            return stack.push(waypoints[index + 1]);
+          }
+        });
+      },
+      _traverse: function(axis, selector, push) {
+        var stack, waypoints;
+
+        if (axis == null) {
+          axis = 'vertical';
+        }
+        if (selector == null) {
+          selector = window;
+        }
+        waypoints = jQMethods.aggregate(selector);
+        stack = [];
+        this.each(function() {
+          var index;
+
+          index = $.inArray(this, waypoints[axis]);
+          return push(stack, index, waypoints[axis]);
+        });
+        return this.pushStack(stack);
+      },
+      _invoke: function(method) {
+        this.each(function() {
+          var waypoints;
+
+          waypoints = Waypoint.getWaypointsByElement(this);
+          return $.each(waypoints, function(i, waypoint) {
+            waypoint[method]();
+            return true;
+          });
+        });
+        return this;
+      }
+    };
+    $.fn[wp] = function() {
+      var args, method;
+
+      method = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+      if (methods[method]) {
+        return methods[method].apply(this, args);
+      } else if ($.isFunction(method)) {
+        return methods.init.apply(this, arguments);
+      } else if ($.isPlainObject(method)) {
+        return methods.init.apply(this, [null, method]);
+      } else if (!method) {
+        return $.error("jQuery Waypoints needs a callback function or handler option.");
+      } else {
+        return $.error("The " + method + " method does not exist in jQuery Waypoints.");
+      }
+    };
+    $.fn[wp].defaults = {
+      context: window,
+      continuous: true,
+      enabled: true,
+      horizontal: false,
+      offset: 0,
+      triggerOnce: false
+    };
+    jQMethods = {
+      refresh: function() {
+        return $.each(contexts, function(i, context) {
+          return context.refresh();
+        });
+      },
+      viewportHeight: function() {
+        var _ref;
+
+        return (_ref = window.innerHeight) != null ? _ref : $w.height();
+      },
+      aggregate: function(contextSelector) {
+        var collection, waypoints, _ref;
+
+        collection = allWaypoints;
+        if (contextSelector) {
+          collection = (_ref = contexts[$(contextSelector)[0][contextKey]]) != null ? _ref.waypoints : void 0;
+        }
+        if (!collection) {
+          return [];
+        }
+        waypoints = {
+          horizontal: [],
+          vertical: []
+        };
+        $.each(waypoints, function(axis, arr) {
+          $.each(collection[axis], function(key, waypoint) {
+            return arr.push(waypoint);
+          });
+          arr.sort(function(a, b) {
+            return a.offset - b.offset;
+          });
+          waypoints[axis] = $.map(arr, function(waypoint) {
+            return waypoint.element;
+          });
+          return waypoints[axis] = $.unique(waypoints[axis]);
+        });
+        return waypoints;
+      },
+      above: function(contextSelector) {
+        if (contextSelector == null) {
+          contextSelector = window;
+        }
+        return jQMethods._filter(contextSelector, 'vertical', function(context, waypoint) {
+          return waypoint.offset <= context.oldScroll.y;
+        });
+      },
+      below: function(contextSelector) {
+        if (contextSelector == null) {
+          contextSelector = window;
+        }
+        return jQMethods._filter(contextSelector, 'vertical', function(context, waypoint) {
+          return waypoint.offset > context.oldScroll.y;
+        });
+      },
+      left: function(contextSelector) {
+        if (contextSelector == null) {
+          contextSelector = window;
+        }
+        return jQMethods._filter(contextSelector, 'horizontal', function(context, waypoint) {
+          return waypoint.offset <= context.oldScroll.x;
+        });
+      },
+      right: function(contextSelector) {
+        if (contextSelector == null) {
+          contextSelector = window;
+        }
+        return jQMethods._filter(contextSelector, 'horizontal', function(context, waypoint) {
+          return waypoint.offset > context.oldScroll.x;
+        });
+      },
+      enable: function() {
+        return jQMethods._invoke('enable');
+      },
+      disable: function() {
+        return jQMethods._invoke('disable');
+      },
+      destroy: function() {
+        return jQMethods._invoke('destroy');
+      },
+      extendFn: function(methodName, f) {
+        return methods[methodName] = f;
+      },
+      _invoke: function(method) {
+        var waypoints;
+
+        waypoints = $.extend({}, allWaypoints.vertical, allWaypoints.horizontal);
+        return $.each(waypoints, function(key, waypoint) {
+          waypoint[method]();
+          return true;
+        });
+      },
+      _filter: function(selector, axis, test) {
+        var context, waypoints;
+
+        context = contexts[$(selector)[0][contextKey]];
+        if (!context) {
+          return [];
+        }
+        waypoints = [];
+        $.each(context.waypoints[axis], function(i, waypoint) {
+          if (test(context, waypoint)) {
+            return waypoints.push(waypoint);
+          }
+        });
+        waypoints.sort(function(a, b) {
+          return a.offset - b.offset;
+        });
+        return $.map(waypoints, function(waypoint) {
+          return waypoint.element;
+        });
+      }
+    };
+    $[wps] = function() {
+      var args, method;
+
+      method = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+      if (jQMethods[method]) {
+        return jQMethods[method].apply(null, args);
+      } else {
+        return jQMethods.aggregate.call(null, method);
+      }
+    };
+    $[wps].settings = {
+      resizeThrottle: 100,
+      scrollThrottle: 30
+    };
+    return $w.on('load.waypoints', function() {
+      return $[wps]('refresh');
+    });
+  });
+
+}).call(this);
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index a9d2d93b..4ff9cf5d 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -7,9 +7,9 @@
  *= require osem-schedule
  *= require osem-schedule-print
  *= require osem-dashboard
- *= require osem-fonts
  *= require osem-splash
  *= require font-awesome
+ *= require osem-fonts
  *= require bootstrap-markdown.min
  *= require bootstrap-datetimepicker
  *= require leaflet
diff --git a/app/assets/stylesheets/fonts/Coustard-Black.woff b/app/assets/stylesheets/fonts/Coustard-Black.woff
deleted file mode 100644
index 15b9fa14..00000000
Binary files a/app/assets/stylesheets/fonts/Coustard-Black.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Coustard.woff b/app/assets/stylesheets/fonts/Coustard.woff
deleted file mode 100644
index 177c66ce..00000000
Binary files a/app/assets/stylesheets/fonts/Coustard.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Bold.woff b/app/assets/stylesheets/fonts/Lato-Bold.woff
deleted file mode 100644
index 4b172511..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Bold.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Italic.woff b/app/assets/stylesheets/fonts/Lato-Italic.woff
deleted file mode 100644
index 09cc3791..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Italic.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Light.woff b/app/assets/stylesheets/fonts/Lato-Light.woff
deleted file mode 100644
index 209dcdd8..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Light.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-LightItalic.woff b/app/assets/stylesheets/fonts/Lato-LightItalic.woff
deleted file mode 100644
index 4e91ecd9..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-LightItalic.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Lato-Regular.woff b/app/assets/stylesheets/fonts/Lato-Regular.woff
deleted file mode 100644
index f48e4848..00000000
Binary files a/app/assets/stylesheets/fonts/Lato-Regular.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Raleway-Bold.woff b/app/assets/stylesheets/fonts/Raleway-Bold.woff
deleted file mode 100644
index 95127a9f..00000000
Binary files a/app/assets/stylesheets/fonts/Raleway-Bold.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Raleway-Light.woff b/app/assets/stylesheets/fonts/Raleway-Light.woff
deleted file mode 100644
index e8d18314..00000000
Binary files a/app/assets/stylesheets/fonts/Raleway-Light.woff and /dev/null differ
diff --git a/app/assets/stylesheets/fonts/Raleway.woff b/app/assets/stylesheets/fonts/Raleway.woff
deleted file mode 100644
index f042895d..00000000
Binary files a/app/assets/stylesheets/fonts/Raleway.woff and /dev/null differ
diff --git a/app/assets/stylesheets/osem-fonts.css b/app/assets/stylesheets/osem-fonts.css.scss
similarity index 68%
rename from app/assets/stylesheets/osem-fonts.css
rename to app/assets/stylesheets/osem-fonts.css.scss
index 50239f2a..c2ea6493 100644
--- a/app/assets/stylesheets/osem-fonts.css
+++ b/app/assets/stylesheets/osem-fonts.css.scss
@@ -3,11 +3,11 @@
 
 @font-face {
   font-family: "suse-icons";
-  src:url("fonts/suse-icons.eot");
-  src:url("fonts/suse-icons.eot?#iefix") format("embedded-opentype"),
-    url("fonts/suse-icons.woff") format("woff"),
-    url("fonts/suse-icons.ttf") format("truetype"),
-    url("fonts/suse-icons.svg#suse-icons") format("svg");
+  src:font-url("suse-icons.eot");
+  src:font-url("suse-icons.eot?#iefix") format("embedded-opentype"),
+    font-url("suse-icons.woff") format("woff"),
+    font-url("suse-icons.ttf") format("truetype"),
+    font-url("suse-icons.svg#suse-icons") format("svg");
   font-weight: normal;
   font-style: normal;
 
@@ -22,8 +22,7 @@
   text-transform: none !important;
   speak: none;
   line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+  font-smoothing: antialiased;
 }
 
 /* We have to repeat this for every symbol that extends font awesome. So if
@@ -38,8 +37,7 @@
   text-transform: none !important;
   speak: none;
   line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+  font-smoothing: antialiased;
 }
 
 .fa-suse:before {
diff --git a/app/assets/stylesheets/osem.css.scss b/app/assets/stylesheets/osem.css.scss
index 624e968d..302e13ee 100644
--- a/app/assets/stylesheets/osem.css.scss
+++ b/app/assets/stylesheets/osem.css.scss
@@ -49,4 +49,8 @@ body {
 
 .col-top {
   vertical-align:top;
+}
+
+fieldset {
+  margin: 20px 0 20px 0;
 }
\ No newline at end of file
diff --git a/app/assets/stylesheets/strap-on.css.scss b/app/assets/stylesheets/strap-on.css.scss
index 7d73b0b4..83fd8e9a 100644
--- a/app/assets/stylesheets/strap-on.css.scss
+++ b/app/assets/stylesheets/strap-on.css.scss
@@ -6,6 +6,7 @@ $navbar-default-link-color: #ffffff;
 $navbar-default-link-hover-color: #000000;
 
 @import 'bootstrap-datetimepicker';
+@import "bootstrap-sprockets";
 
 //
 // Bootstrap components
@@ -59,4 +60,4 @@ $navbar-default-link-hover-color: #000000;
 
 // Utility classes
 @import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
\ No newline at end of file
+@import "bootstrap/responsive-utilities";
diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb
index 969b77dd..feaa2a0e 100644
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@@ -11,6 +11,18 @@ class ConferenceController < ApplicationController
     @keynote_speakers = @conference.keynote_speakers
   end
 
+  def schedule
+    @rooms = @conference.rooms
+    @events = @conference.events
+    @dates = @conference.start_date..@conference.end_date
+
+    if @dates == Date.current
+      @today = Date.current.strftime('%Y-%m-%d')
+    else
+      @today = @conference.start_date.strftime('%Y-%m-%d')
+    end
+  end
+
   def gallery_photos
     @photos = @conference.photos
     render 'photos', formats: [:js]
diff --git a/app/controllers/conference_registrations_controller.rb b/app/controllers/conference_registrations_controller.rb
index 20460016..28ba9766 100644
--- a/app/controllers/conference_registrations_controller.rb
+++ b/app/controllers/conference_registrations_controller.rb
@@ -9,24 +9,22 @@ class ConferenceRegistrationsController < ApplicationController
   end
 
   def show
-    @workshops = @registration.workshops if @registration
+    @workshops = @registration.workshops
     @total_price = Ticket.total_price(@conference, current_user)
+    @tickets = current_user.ticket_purchases.where(conference_id: @conference.id)
   end
 
   def edit; end
 
   def create
-    user_attributes = registration_params[:user_attributes]
-    params[:registration].delete :user_attributes
-
     @registration = current_user.registrations.build(registration_params)
     @registration.conference_id = @conference.id
 
-    if @registration.save && current_user.update_attributes(user_attributes)
+    if @registration.save
       # Trigger ahoy event
       ahoy.track 'Registered', title: 'New registration'
 
-      if @conference.tickets.any?
+      if @conference.tickets.any? && !current_user.supports?(@conference)
         redirect_to conference_tickets_path(@conference.short_title),
                     notice: 'You are now registered and will be receiving E-Mail notifications.'
       else
@@ -66,6 +64,9 @@ class ConferenceRegistrationsController < ApplicationController
 
   def set_registration
     @registration = current_user.registrations.find_by(conference_id: @conference.id)
+    if !@registration
+      redirect_to new_conference_conference_registrations_path(@conference.short_title)
+    end
   end
 
   def registration_params
diff --git a/app/controllers/schedule_controller.rb b/app/controllers/schedule_controller.rb
deleted file mode 100644
index efdc65c8..00000000
--- a/app/controllers/schedule_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class ScheduleController < ApplicationController
-  authorize_resource class: false
-  layout 'application'
-
-  def index
-    @conference = Conference.
-        includes(:rooms, events: [:speakers, :track, :event_type]).
-        where(conferences: { short_title: params[:conference_id] }).first
-    @rooms = @conference.rooms
-    @events = @conference.events
-    @dates = @conference.start_date..@conference.end_date
-
-    if @dates == Date.current
-      @today = Date.current.strftime('%Y-%m-%d')
-    else
-      @today = @conference.start_date.strftime('%Y-%m-%d')
-    end
-  end
-end
diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb
index a533871f..d54f271f 100644
--- a/app/controllers/ticket_purchases_controller.rb
+++ b/app/controllers/ticket_purchases_controller.rb
@@ -6,9 +6,12 @@ class TicketPurchasesController < ApplicationController
   def create
     message = TicketPurchase.purchase(@conference, current_user, params[:tickets][0])
     if message.blank?
-      redirect_to conference_conference_registrations_path(@conference.short_title),
-                  notice: 'Congratulations, you have successfully purchased a ticket! ' \
-                    "You can pay for it in cash when you arrive! Thank you for supporting #{@conference.title}!"
+      if current_user.ticket_purchases.any?
+        redirect_to conference_conference_registrations_path(@conference.short_title),
+                    notice: "Thank you for supporting #{@conference.title} by purchasing a ticket."
+      else
+        redirect_to conference_conference_registrations_path(@conference.short_title)
+      end
     else
       redirect_to conference_conference_registrations_path(@conference.short_title),
                   alert: "Oops, something went wrong with your purchase! #{message}"
@@ -16,7 +19,7 @@ class TicketPurchasesController < ApplicationController
   end
 
   def destroy
-    @ticket_purchases = current_user.ticket_purchases.find_by(ticket_id: params[:id])
+    @ticket_purchases = current_user.ticket_purchases.find(params[:id])
     if @ticket_purchases.destroy
       redirect_to conference_conference_registrations_path(@conference.short_title),
                   notice: 'Ticket successfully deleted.'
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index fc6cc55e..55c73fc0 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -1,8 +1,15 @@
 class TicketsController < ApplicationController
   before_filter :authenticate_user!
   load_resource :conference, find_by: :short_title
-  load_resource :tickets, class: Ticket
+  load_resource :ticket, through: :conference
   authorize_resource :conference_registrations, class: Registration
+  before_filter :check_load_resource, only: :index
 
   def index; end
+
+  def check_load_resource
+    if @tickets.empty?
+      redirect_to root_path, notice: "There are no tickets available for #{@conference.title}!"
+    end
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9da23c54..50b11829 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -199,6 +199,17 @@ module ApplicationHelper
     return ts
   end
 
+  # rubocop:disable Lint/EndAlignment
+  def word_pluralize(count, singular, plural = nil)
+    word = if (count == 1 || count =~ /^1(\.0+)?$/)
+      singular
+    else
+      plural || singular.pluralize
+    end
+
+    "#{word}"
+  end
+
   def markdown(text)
     options = {
       autolink: true,
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 332c612f..48867723 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -61,7 +61,6 @@ class Ability
 
     signed_in(user) # Inherit abilities from signed user
     # User with role
-    can :manage, User if user.is_admin # ??? || (user.has_role? :organizer, :any)
     can [:new, :create], Conference if user.is_admin || (user.has_role? :organizer, :any)
     can [:index, :show, :gallery_photos], Conference
     can :manage, Conference, id: conf_ids_for_organizer
@@ -100,45 +99,47 @@ class Ability
     can :manage, CallForPaper, conference_id: conf_ids_for_organizer + conf_ids_for_cfp
     can :manage, Venue, conference_id: conf_ids_for_organizer
     can :index, Venue, conference_id: conf_ids_for_organizer + conf_ids_for_cfp
+    can :manage, :all if user.is_admin
   end
 
+  # Abilities for everyone, even guests (not logged in users)
   def guest
-    ## Abilities for everyone, even guests (not logged in users)
-    can [:index, :show], Conference do |conference|
+    # can view conferences
+    can [:index], Conference
+    can [:show], Conference do |conference|
       conference.splashpage && conference.splashpage.public == true
     end
+    can [:schedule], Conference do |conference|
+      conference.call_for_paper && conference.call_for_paper.schedule_public
+    end
 
-    # see commercials too
-
+    # can view confirmed Events
     can :show, Event do |event|
       event.state == 'confirmed'
     end
-
-    can :index, :schedule # show?
+    # can view Commercials of confirmed Events
+    can :show, Commercial, commercialable_type: 'Event', commercialable_id: Event.where(state: 'confirmed').pluck(:id)
+    # can view others
     can :show, User
   end
 
   def signed_in(user)
     guest # Inherits abilities of guest
 
-    # Can subscribe, unsubscribe to a conference
+    # subscribe, unsubscribe to a Conference
     can [:create, :destroy], Subscription, user_id: user.id
 
-    # Conference Registration
+    # can manage their own Registration
     can :manage, Registration, user_id: user.id
 
+    # can manage their own User
     can :manage, User, id: user.id
-    can :show, User
 
-    ## Proposals
-    # Users can manage their own proposals
+    # can manage their own Event
     can :manage, Event, id: user.events.pluck(:id)
-
-    # Submit proposals only for conferences that are not over yet
+    # can submit Events for conferences that are not over yet
     can :create, Event, conference_id: Conference.where('end_date >= ?', Date.today).pluck(:id)
-    # Users can manage their own commercials
+    # can manage their own commercials
     can :manage, Commercial, commercialable_type: 'Event', commercialable_id: user.events.pluck(:id)
-    # View commercials of confirmed events
-    can :show, Commercial, commercialable_type: 'Event', commercialable_id: Event.where(state: 'confirmed').pluck(:id)
   end
 end
diff --git a/app/models/conference.rb b/app/models/conference.rb
index f79d9678..5af417d7 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -101,6 +101,7 @@ class Conference < ActiveRecord::Base
   validates_format_of :short_title, with: /\A[a-zA-Z0-9_-]*\z/
   before_create :generate_guid
   before_create :create_event_types
+  before_create :create_difficulty_levels
   before_create :create_email_settings
   before_create :add_color
 
@@ -897,6 +898,22 @@ class Conference < ActiveRecord::Base
     true
   end
 
+  ##
+  # Creates default DifficultyLevels for this Conference. Used as before_create.
+  #
+  def create_difficulty_levels
+    difficulty_levels << DifficultyLevel.create(title: 'Easy',
+                                                description: 'Events are understandable for everyone without knowledge of the topic.',
+                                                color: '#70EF69')
+    difficulty_levels << DifficultyLevel.create(title: 'Medium',
+                                                description: 'Events require a basic understanding of the topic.',
+                                                color: '#EEEF69')
+    difficulty_levels << DifficultyLevel.create(title: 'Hard',
+                                                description: 'Events require expert knowledge of the topic.',
+                                                color: '#EF6E69')
+    true
+  end
+
   ##
   # Creates a EmailSettings association proxy. Used as before_create.
   #
diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb
index f315e2db..d40b2eb8 100644
--- a/app/models/email_settings.rb
+++ b/app/models/email_settings.rb
@@ -27,7 +27,7 @@ class EmailSettings < ActiveRecord::Base
                                   conference.short_title, host: CONFIG['url_for_emails']),
       'cfp_start_date' => conference.call_for_papers.start_date,
       'cfp_end_date' => conference.call_for_papers.end_date,
-      'schedule_link' => Rails.application.routes.url_helpers.conference_schedule_url(
+      'schedule_link' => Rails.application.routes.url_helpers.schedule_conference_url(
                          conference.short_title, host: CONFIG['url_for_emails'])
     }
 
diff --git a/app/models/ticket_purchase.rb b/app/models/ticket_purchase.rb
index 6dd070e1..89f992f8 100644
--- a/app/models/ticket_purchase.rb
+++ b/app/models/ticket_purchase.rb
@@ -13,11 +13,18 @@ class TicketPurchase < ActiveRecord::Base
                           scope: :ticket_id,
                           message: 'already bought this ticket!'
 
+  delegate :title, to: :ticket
+  delegate :description, to: :ticket
+  delegate :price, to: :ticket
+  delegate :price_cents, to: :ticket
+  delegate :price_currency, to: :ticket
+
   def self.purchase(conference, user, purchases)
     errors = []
     ActiveRecord::Base.transaction do
       conference.tickets.each do |ticket|
         quantity = purchases[ticket.id.to_s].to_i
+        # if the user bought the ticket, just update the quantity
         if ticket.bought?(user)
           purchase = update_quantity(conference, quantity, ticket, user)
         else
diff --git a/app/models/track.rb b/app/models/track.rb
index 5cdb2bb3..bd48e58d 100644
--- a/app/models/track.rb
+++ b/app/models/track.rb
@@ -4,6 +4,7 @@ class Track < ActiveRecord::Base
   has_many :events
 
   before_create :generate_guid
+  validates :name, presence: true
 
   validates :name, presence: true
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 77067471..b205ae4c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,13 +59,17 @@ class User < ActiveRecord::Base
     self.subscriptions.find_by(conference_id: conference.id).present?
   end
 
-  # Returns the ticket purchased ticket
+  # Returns the purchased ticket
   # ====Returns
   # * +TicketUser::ActiveRecord_Relation+ -> user
   def ticket(id)
     ticket_purchases.where(ticket_id: id).first
   end
 
+  def supports? conference
+    ticket_purchases.find_by(conference_id: conference.id).present?
+  end
+
   def self.for_ichain_username(username, attributes)
     user = find_by(username: username)
 
diff --git a/app/models/venue.rb b/app/models/venue.rb
index 2eab0d82..7177bbd7 100644
--- a/app/models/venue.rb
+++ b/app/models/venue.rb
@@ -17,7 +17,7 @@ class Venue < ActiveRecord::Base
   after_update :send_mail_notification
 
   def address
-    "#{conference.venue.street}, #{conference.venue.postalcode} #{conference.venue.city}, #{conference.venue.country}"
+    "#{street}, #{city}, #{country_name}"
   end
 
   def country_name
diff --git a/app/views/admin/commercials/index.html.haml b/app/views/admin/commercials/index.html.haml
index 9146f654..a6f6d3c3 100644
--- a/app/views/admin/commercials/index.html.haml
+++ b/app/views/admin/commercials/index.html.haml
@@ -4,7 +4,7 @@
       %h1 Commercials
       %p.text-muted
         Conference commercials will be displayed on the events in the
-        = link_to "schedule,", conference_schedule_path(@conference.short_title)
+        = link_to "schedule,", schedule_conference_path(@conference.short_title)
         if the event speaker didn't add an event commercial.
 - @commercials.each_slice(3) do |slice|
   .row
diff --git a/app/views/admin/difficulty_levels/index.html.haml b/app/views/admin/difficulty_levels/index.html.haml
index 60b3f7e8..f2668a71 100644
--- a/app/views/admin/difficulty_levels/index.html.haml
+++ b/app/views/admin/difficulty_levels/index.html.haml
@@ -30,4 +30,4 @@
                 method: :delete, class: 'btn btn-danger', data: { confirm: "Do you really want to delete #{difficulty_level.title}?" }
 .row
   .col-md-12.text-right
-    = link_to 'Add Difficulty Level', new_admin_conference_difficulty_level_path(@conference.short_title), class: 'btn btn-primary'
\ No newline at end of file
+    = link_to 'Add Difficulty Level', new_admin_conference_difficulty_level_path(@conference.short_title), class: 'btn btn-primary'
diff --git a/app/views/admin/tickets/index.html.haml b/app/views/admin/tickets/index.html.haml
index e4828c44..54b29754 100644
--- a/app/views/admin/tickets/index.html.haml
+++ b/app/views/admin/tickets/index.html.haml
@@ -10,6 +10,7 @@
       %table.table.table-hover#tickets
         %thead
           %th Title
+          %th Description
           %th Price
           %th Sold
           %th Actions
@@ -19,6 +20,8 @@
               %td
                 = link_to(admin_conference_ticket_path(@conference.short_title, ticket.id)) do
                   = ticket.title
+              %td
+                = truncate(ticket.description)
               %td
                 = humanized_money_with_symbol ticket.price
               %td
diff --git a/app/views/conference/_conference_details.html.haml b/app/views/conference/_conference_details.html.haml
index 7724c1aa..6303e911 100644
--- a/app/views/conference/_conference_details.html.haml
+++ b/app/views/conference/_conference_details.html.haml
@@ -10,25 +10,26 @@
             %small
               %b
               = date_string(conference.start_date, conference.end_date)
+          - if conference.venue
+            %p
+              = "#{conference.venue.city}/#{conference.venue.country_name}"
         .col-md-2
           .btn-group-vertical
-            - if current_user.nil? || !current_user.subscribed?(conference)
-              = link_to 'Subscribe', conference_subscriptions_path(conference.short_title), method: :post, class: 'btn btn-info btn-group-vertical'
-            - else
-              = link_to 'Unsubscribe', conference_subscriptions_path(conference.short_title), method: :delete, class: 'btn btn-danger btn-group-vertical'
-
             - if !@conference || @conference != conference
               - if conference.splashpage && conference.splashpage.public
                 = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
+            - if conference.call_for_paper and conference.call_for_paper.schedule_public
+              = link_to "Schedule", schedule_conference_path(conference.short_title), :class =>"btn btn-default"
             - if conference.registration_open?
               - if conference.user_registered?(current_user)
-                = link_to "Modify Registration", edit_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
+                = link_to "My Registration", conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
               - else
-                = link_to "Register", new_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-success"
-            = link_to "Schedule", conference_schedule_path(conference.short_title), :class =>"btn btn-default" if conference.call_for_paper and conference.call_for_paper.schedule_public
+                = link_to "Register", new_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
             - if !current_user.nil? && current_user.proposal_count(conference) > 0
-              = link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
+              = link_to "My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
             - elsif conference.cfp_open?
               = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
-            - if !current_user.nil? && conference.tickets.any?
-              = link_to 'Support', conference_tickets_path(conference.short_title), class: 'btn btn-default'
+            - if current_user.nil? || !current_user.subscribed?(conference)
+              = link_to 'Subscribe', conference_subscriptions_path(conference.short_title), method: :post, class: 'btn btn-default'
+            - else
+              = link_to 'Unsubscribe', conference_subscriptions_path(conference.short_title), method: :delete, class: 'btn btn-default'
diff --git a/app/views/conference/_lodging.html.haml b/app/views/conference/_lodging.html.haml
index 3ce4c2f6..7d603a68 100644
--- a/app/views/conference/_lodging.html.haml
+++ b/app/views/conference/_lodging.html.haml
@@ -1,9 +1,13 @@
 .container
   .row
     .col-md-12.text-center
-      %h2 Accommodation Deals
+      %h2
+        Where to stay
+        - if @conference.venue
+          in
+          = @conference.venue.city
       %p.lead
-        We have prepared affordable accommodation deals for your visit.
+        We recommend these affordable lodging accommodations for your visit.
   - @conference.lodgings.each_slice(3) do |slice|
     .row.row-centered
       - slice.each do |lodging|
diff --git a/app/views/conference/_program.html.haml b/app/views/conference/_program.html.haml
index f352528d..40e5db13 100644
--- a/app/views/conference/_program.html.haml
+++ b/app/views/conference/_program.html.haml
@@ -21,7 +21,7 @@
     .row
       .col-md-12
         %p.cta-button.text-center
-          = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
+          = link_to(schedule_conference_path(@conference.short_title), class: 'btn btn-default btn-lg') do
             Full Schedule
 
   - #FIXME: Display keynotes https://github.com/openSUSE/osem/issues/544 
diff --git a/app/views/conference/_venue.html.haml b/app/views/conference/_venue.html.haml
index 5c8742bb..4fd90246 100644
--- a/app/views/conference/_venue.html.haml
+++ b/app/views/conference/_venue.html.haml
@@ -3,7 +3,7 @@
     %a.smoothscroll{ href: '#venue' } Venue
 -if !@conference.venue.latitude.blank? and !@conference.venue.longitude.blank?
   #map{style: "height: 500px;" }
-  - popup = "<h3>#{@conference.venue.name}</h3><br>#{@conference.venue.street}<br>#{@conference.venue.postalcode}, #{@conference.venue.city}<br>#{@conference.venue.country_name}"
+  - popup = "<h3>#{@conference.venue.name}</h3><br>#{@conference.venue.street}<br>#{@conference.venue.city}<br>#{@conference.venue.country_name}"
   - content_for(:script_body) do
     :javascript
       // create a map in the "map" div, set the view to a given place and zoom
@@ -17,6 +17,25 @@
       L.marker([#{@conference.venue.longitude}, #{@conference.venue.latitude}]).addTo(map)
         .bindPopup("#{popup}")
         .openPopup();
+      // Turn scrollwheel on when user clicks
+      map.on('focus', function(e) {
+        map.scrollWheelZoom.enable();
+      });
+      // Turn scrollwheel off once the map isn't in the viewport anymore
+      $('#map').waypoint({
+        handler: function(direction) {
+          map.scrollWheelZoom.disable();
+          //alert('map');
+        },
+        offset: '90%'
+      });
+      $('#map').waypoint({
+        handler: function(direction) {
+          map.scrollWheelZoom.disable();
+          //alert('map');
+        },
+        offset: '10%'
+      });
 -else
   .container
     .row
diff --git a/app/views/conference/index.html.haml b/app/views/conference/index.html.haml
index 8e1b05f0..79ea924d 100644
--- a/app/views/conference/index.html.haml
+++ b/app/views/conference/index.html.haml
@@ -18,12 +18,13 @@
       - @antiquated.each do |conference|
         = render :partial => "conference_details", :locals => {:conference => conference}
 
-:javascript
-  $('#antiquated').on('hidden.bs.collapse', function () {
-    $( ".fa-chevron-down" ).hide();
-    $( ".fa-chevron-right" ).show();
-  })
-  $('#antiquated').on('shown.bs.collapse', function () {
-    $( ".fa-chevron-down" ).show();
-    $( ".fa-chevron-right" ).hide();
-  })
+-content_for :script_body do
+  :javascript
+    $('#antiquated').on('hidden.bs.collapse', function () {
+      $( ".fa-chevron-down" ).hide();
+      $( ".fa-chevron-right" ).show();
+    })
+    $('#antiquated').on('shown.bs.collapse', function () {
+      $( ".fa-chevron-down" ).show();
+      $( ".fa-chevron-right" ).hide();
+    })
diff --git a/app/views/conference/photos.js.haml b/app/views/conference/photos.js.haml
deleted file mode 100644
index 5e24851d..00000000
--- a/app/views/conference/photos.js.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-$('#gallery .carousel-inner').append("#{escape_javascript(render('gallery_photo', photos: @photos)) }");
-$('#gallery .modal-body').children('.fa').remove();
-$('#gallery #carousel-example-generic').css('visibility','visible');
-
diff --git a/app/views/schedule/index.html.erb b/app/views/conference/schedule.html.erb
similarity index 100%
rename from app/views/schedule/index.html.erb
rename to app/views/conference/schedule.html.erb
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index 4cc793d2..ea9af0ee 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -45,7 +45,7 @@
       %section#lodging
         = render 'lodging'
 
-    - if @conference.tickets.any? and @conference.splashpage.include_tickets
+    - if @conference.tickets.any? and @conference.splashpage.include_tickets and @conference.pending?
       %section#tickets
         = render 'tickets'
 
diff --git a/app/views/conference_registrations/_form.html.haml b/app/views/conference_registrations/_form.html.haml
index ac2758b6..d5b4ada6 100644
--- a/app/views/conference_registrations/_form.html.haml
+++ b/app/views/conference_registrations/_form.html.haml
@@ -1,23 +1,23 @@
 .container
   .row
     .col-md-12
+      .page-header
+        %h1
+          Registration for
+          = @conference.title
+  .row
+    .col-md-8
       = semantic_form_for(@registration, url: conference_conference_registrations_path(@conference.short_title)) do |f|
-        .tabbable
-          %ul.nav.nav-tabs
-            %li.active
-              = link_to 'Register', '#register-content', 'data-toggle' => 'tab'
-            - if @conference.use_volunteers
-              %li
-                = link_to 'Volunteer', '#volunteer-content', 'data-toggle' => 'tab'
-          .tab-content
-            #register-content.tab-pane.active
-              = render 'conference_registrations/registration', f: f
-            - if @conference.use_volunteers
-              #volunteer-content.tab-pane
-                = render 'conference_registrations/volunteer', f: f
-        - if @conference.user_registered?(current_user)
-          = f.action :submit, button_html: { value: 'Update Registration', class: 'btn btn-primary' }
-          = link_to 'Unregister', conference_conference_registrations_path(@conference.short_title),
-          method: :delete, class: 'btn btn-danger', confirm: 'Are you sure you want to unregister?'
-        - else
-          = f.action :submit, button_html: { value: 'Register', class: 'btn btn-primary', id: 'register' }
+        - if @conference.questions.any?
+          = render partial: 'questions', locals: { f: f }
+        - if @conference.events.workshops.any?
+          =f.inputs 'Register to Workshops' do
+            = f.input :events, as: :check_boxes, label: false, collection: @conference.events.workshops
+        = f.inputs 'Your Travel Info' do
+          = f.input :arrival, as: :string, label: 'Your arrival time', input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker', readonly: 'readonly'  }
+          = f.input :departure, as: :string, label: 'Your departure time', input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly'  }
+        %p.pull-right
+          - if @conference.user_registered?(current_user)
+            = f.action :submit, button_html: { value: 'Update Registration', class: 'btn btn-primary' }
+          - else
+            = f.action :submit, button_html: { value: 'Register', class: 'btn btn-primary', id: 'register' }
diff --git a/app/views/conference_registrations/_questions.html.haml b/app/views/conference_registrations/_questions.html.haml
index 93404c5d..da80e2d3 100644
--- a/app/views/conference_registrations/_questions.html.haml
+++ b/app/views/conference_registrations/_questions.html.haml
@@ -1,10 +1,8 @@
 - @conference.questions.each do |q|
-  %h5
-    = "Q: #{q.title}"
-  - if q.question_type.id == 1  || q.question_type.id == 2 # yes/no or single choice
-    = f.input :qanswers, :collection => q.qanswers, :as => :select, :input_html => { :multiple => false }, :label => false, :include_blank => "Please make your choice",
-              :member_label => Proc.new {|a| a.answer.title}
-
-  - if q.question_type.id == 3  # multiple choice
-    = f.input :qanswers, :collection => q.qanswers, :as => :check_boxes, :label => false,
-              :member_label => Proc.new {|a| a.answer.title}
\ No newline at end of file
+  = f.inputs 'Additional Info' do
+    - if q.question_type.id == 1  || q.question_type.id == 2 # yes/no or single choice
+      = f.input :qanswers, :collection => q.qanswers, :as => :select, :input_html => { :multiple => false, class: 'col-sm-10' }, label: q.title, :include_blank => "Please make your choice",
+                :member_label => Proc.new {|a| a.answer.title}
+    - if q.question_type.id == 3  # multiple choice
+      = f.input :qanswers, :collection => q.qanswers, :as => :check_boxes, :input_html => { class: 'col-sm-2' }, :label => false,
+                :member_label => Proc.new {|a| a.answer.title}
\ No newline at end of file
diff --git a/app/views/conference_registrations/_registration.html.haml b/app/views/conference_registrations/_registration.html.haml
deleted file mode 100644
index bf7e3624..00000000
--- a/app/views/conference_registrations/_registration.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-.row
-  .col-md-12
-    %h3
-      Registration for
-      = @conference.title
-- if current_user.proposal_count(@conference) > 0
-  .row
-    .col-md-12
-      %i
-        Please note: Registration is not automatically performed for speakers.  If you're scheduled to speak at the conference, you still need to register!
-.row
-  .col-md-12
-    = f.inputs name: 'Your Details' do
-      - if @conference.questions
-        = render partial: 'questions', locals: { f: f }
-      %br
-
-      - if @conference.events.workshops.any?
-        =f.inputs 'Register to Workshops' do
-          = f.input :events, as: :check_boxes, label: false, collection: @conference.events.workshops
-
-    = f.inputs 'Travel Info' do
-      = f.input :arrival, as: :string,  input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker', readonly: 'readonly'  }
-      = f.input :departure, as: :string, input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly'  }
diff --git a/app/views/conference_registrations/_tickets_bought.html.haml b/app/views/conference_registrations/_tickets_bought.html.haml
deleted file mode 100644
index 20b2f9dd..00000000
--- a/app/views/conference_registrations/_tickets_bought.html.haml
+++ /dev/null
@@ -1,46 +0,0 @@
-%table.table.table-hover
-  %thead
-    %tr
-      %th Ticket
-      %th.text-center Quantity
-      %th.text-center Price
-      %th.text-center Total
-      %th
-  %tbody
-    - tickets.each do |ticket|
-      %tr
-        %td.col-sm-8.col-md-6
-          .media
-            .media-body
-              %h4.media-heading
-                = ticket.title
-              %h5.media-heading
-              -if !ticket.description.blank?
-                = markdown(ticket.description)
-        %td.col-sm-1.col-md-1.text-center
-          = ticket.quantity_bought_by(current_user)
-        %td.col-sm-1.col-md-1.text-center
-          = humanized_money_with_symbol ticket.price
-        %td.col-sm-1.col-md-1.text-center
-          %strong
-            = ticket.total_price(current_user)
-        %td.col-sm-1.col-md-1.text-center
-          = link_to conference_ticket_purchase_path(@conference.short_title, ticket.id),
-          method: :delete, class: 'btn btn-danger',
-          data: { confirm: "Do you really want to delete the #{ticket.title} for #{@conference.title}?" } do
-            Delete
-            %i.fa.fa-trash-o
-    %tr
-      %td
-      %td
-      %td
-      %td.col-sm-1.col-md-1.text-center
-        %h4
-          Total
-      %td.col-sm-1.col-md-1.text-center
-        %h4
-          %strong
-            - if @total_price.cents == -1
-              not-calculable
-            - else
-              = humanized_money_with_symbol Ticket.total_price(@conference, current_user)
diff --git a/app/views/conference_registrations/show.html.haml b/app/views/conference_registrations/show.html.haml
index d28198be..7fbf8793 100644
--- a/app/views/conference_registrations/show.html.haml
+++ b/app/views/conference_registrations/show.html.haml
@@ -3,117 +3,136 @@
     .col-md-12
       .page-header
         %h1
+          Registration for
           = @conference.title
+        %p.text-muted
+          -if @conference.venue
+            at
+            %strong
+              = "#{@conference.venue.name},"
+            = "#{@conference.venue.street},"
+            = "#{@conference.venue.city} / #{@conference.venue.country_name}."
           %small
             = date_string(@conference.start_date, @conference.end_date)
-  .row
-    .col-md-6
-      - if @conference.venue
-        %p
-          %small
-            at
-            = link_to @conference.venue.name
-            ,
-            = link_to @conference.venue.address, "http://maps.google.com/maps?q=#{@conference.venue.address}"
-    .col-md-4
-      - if @conference.contact.facebook.present?
-        = link_to "#{ @conference.contact.facebook }" do
-          %i.fa.fa-facebook-square
-      - if @conference.contact.twitter.present?
-        = link_to "#{ @conference.contact.twitter }" do
-          %i.fa.fa-twitter
-      - if @conference.contact.instagram.present?
-        = link_to "#{ @conference.contact.instagram }" do
-          %i.fa.fa-instagram
-      - if @conference.contact.googleplus.present?
-        = link_to "#{ @conference.contact.googleplus }" do
-          %i.fa.fa-google-plus-square
   .row
     .col-md-12
-      - if @conference.tickets.any?
-        %h3
-          Tickets
-        - if current_user.tickets.any?
-          %p
-            You have purchased the following tickets:
-          = render partial: 'tickets_bought', locals: { tickets: current_user.tickets }
-        - else
-          = render partial: 'tickets', locals: { tickets: @conference.tickets }
-        %p
-          If you would like to buy more tickets, please click
-          = link_to 'here', conference_tickets_path(@conference.short_title)
-  .row
-    .col-md-12
-      - if @conference.speakers.confirmed.any?
-        %h3
-          = pluralize(@conference.speakers.confirmed.count, 'Speaker')
-        - @conference.speakers.confirmed.limit(12).each_slice(4) do |slice|
-          .row
-            - slice.each do |speaker|
-              .col-md-3
-                .row
-                  .col-md-3
-                    = image_tag(speaker.gravatar_url(size: '25'),
-                    title: "Yo #{speaker.name}!",
-                    alt: '', 'class' => 'img-circle img-responsive text-center')
-                  .col-md-9
-                    %h4
-                      = speaker.name
-  .row
-    .col-md-12
-      - if @conference.events.confirmed.any?
-        %h3
-          = pluralize(@conference.events.confirmed.count, 'Event')
-        %ul.list-unstyled
-          - @conference.events.confirmed.limit(10).each do |event|
-            %li
-              %h4
-                = link_to event.title, conference_proposal_path(@conference.short_title, event.id)
-                %strong
-                  presented by
-                = event.speaker_names
-  .row
-    .col-md-12
-      - if @conference.participants.any?
-        %h3
-          = pluralize(@conference.participants.count, 'Participant')
-        - @conference.participants.limit(36).each_slice(12) do |slice|
-          .row
-            - slice.each do |participant|
-              .col-md-1
-                = image_tag(participant.gravatar_url(size: '25'),
-                title: "Yo #{participant.name}!",
-                alt: '', 'class' => 'img-circle img-responsive text-center')
-  .row
-    .col-md-12
-      - if @registration
-        %h2
-          Congratulations! You are now registered for
-          = "#{@conference.title}!"
-        - if @conference.questions.any?
-          %h3 Your answers to the registrations questions are:
+      %h4
+        %span.fa-stack
+          %i.fa.fa-square-o.fa-stack-2x
+          %i.fa.fa-plane.fa-stack-1x
+        Travel Schedule
+      %ul
+        %li
+          - if @registration.arrival.present?
+            arrive at
+            %strong
+              = @registration.arrival.strftime('%A, %B %-d. %Y %H:%m')
+          - else
+            You haven't scheduled your arrival
+        %li
+          - if @registration.departure.present?
+            depart at
+            %strong
+              = @registration.departure.strftime('%A, %B %-d. %Y %H:%m')
+          - else
+            You haven't scheduled your departure
+  - if @conference.questions.any?
+    .row
+      .col-md-12
+        %h4
+          %span.fa-stack
+            %i.fa.fa-square-o.fa-stack-2x
+            %i.fa.fa-info.fa-stack-1x
+          Additional Info
+        %ul
           - @conference.questions.each do |q|
-            %p
-              %b Question:
-              = q.title
-              %b Your Answer:
-              - @registration.qanswers.where(:question_id => q.id).each do |qa|
-                = qa.answer.title
-        - if @workshops.any?
-          %h3 You are registered for the following workshops:
-          %ul.list-unstyled
-            - @workshops.each do |workshop|
-              %li
-                %h4
-                  = link_to workshop.title, conference_proposal_path(@conference.short_title, workshop.id)
-                  %strong
-                    presented by
-                  = workshop.speaker_names
-        %div
-          = link_to 'Modify your Registration', edit_conference_conference_registrations_path(@conference.short_title), class: 'btn btn-success'
+            %li
+              %strong
+                = q.title
+              - if @registration.qanswers.any?
+                - @registration.qanswers.where(:question_id => q.id).each do |qa|
+                  = qa.answer.title
+              - else
+                You haven't answered
+  - if @workshops.any?
+    .row
+      .col-md-12
+        %h4
+          %span.fa-stack
+            %i.fa.fa-square-o.fa-stack-2x
+            %i.fa.fa-check.fa-stack-1x
+          Event Registrations
+        %ul
+          - @workshops.each do |workshop|
+            %li
+              = link_to workshop.title, conference_proposal_path(@conference.short_title, workshop.id)
+  - if @conference.tickets.any?
+    .row
+      .col-md-12
+        %h4
+          %span.fa-stack
+            %i.fa.fa-square-o.fa-stack-2x
+            %i.fa.fa-ticket.fa-stack-1x
+          Tickets
+          -if @tickets.any?
+            = "(#{@total_price} #{@tickets.first.price.symbol})"
+        %ul
+          - @tickets.each do |ticket|
+            %li
+              = ticket.quantity
+              = ticket.title
+              = word_pluralize(ticket.quantity, 'Ticket')
+              for
+              = humanized_money ticket.price
+              = ticket.price.symbol
+              = link_to conference_ticket_purchase_path(@conference.short_title, ticket.id), method: :delete,
+                                                                                            id: "ticket-#{ticket.id}-delete",
+                                                                                            class: 'btn btn-danger btn-xs',
+                                                                                            data: { confirm: "Do you really want to delete the #{ticket.title} ticket for #{@conference.title}?" } do
+                %i.fa.fa-trash-o
+          %li
+            - if @tickets.any?
+              = link_to 'Buy more tickets', conference_tickets_path(@conference.short_title)
+            - else
+              You haven't bought any tickets.
+              = link_to 'Please buy some tickets to support us!', conference_tickets_path(@conference.short_title)
+
+  .row
+    .col-md-12
+      -if @registration
+        .btn-group-vertical.pull-right
+          = link_to 'Edit your Registration', edit_conference_conference_registrations_path(@conference.short_title), class: 'btn btn-success'
           = link_to 'Unregister', conference_conference_registrations_path(@conference.short_title),
-                  method: :delete, class: 'btn btn-danger', confirm: 'Are you sure you want to unregister?'
+          method: :delete, class: 'btn btn-danger btn-xs', confirm: 'Are you sure you want to unregister?'
       - else
-        %p.lead
-          = "Unfortunately you are not registered for #{@conference.title}. If you want to register click"
-          = link_to 'here.', new_conference_conference_registrations_path(@conference.short_title)
+        = link_to 'Register', new_conference_conference_registrations_path(@conference.short_title), class: 'btn btn-success btn-lg pull-right'
+
+  .row
+    .col-md-12
+      .page-header
+        %h1
+          %small
+            Meet the people of
+            = @conference.short_title
+    .col-md-4
+      - if @conference.participants.any?
+        %h4
+          %span.fa-stack
+            %i.fa.fa-square-o.fa-stack-2x
+            %i.fa.fa-group.fa-stack-1x
+          = @conference.participants.count
+          Registered
+          = word_pluralize(@conference.participants.count, 'Attendees')
+        - @conference.participants.each do |participant|
+          = image_tag(participant.gravatar_url(size: '25'), title: "#{participant.name}!", class: 'img-circle')
+    .col-md-4.col-md-offset-2
+      - if @conference.speakers.any?
+        %h4
+          %span.fa-stack
+            %i.fa.fa-square-o.fa-stack-2x
+            %i.fa.fa-microphone.fa-stack-1x
+          = @conference.speakers.count
+          Confirmed
+          = word_pluralize(@conference.speakers.count, 'Speaker')
+        - @conference.speakers.each do |speaker|
+          = image_tag(speaker.gravatar_url(size: '25'), title: "#{speaker.name}!", class: 'img-circle')
diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml
index 63eb7cfd..31c2d895 100644
--- a/app/views/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@@ -7,7 +7,7 @@
   = link_to(edit_user_path(current_user.id)) do
     %span.fa.fa-user
     Edit Profile
--if @conference and @conference.id
+-if @conference and @conference.call_for_paper
   %li
     = link_to(conference_proposal_index_path(@conference.short_title)) do
       %span.fa.fa-comment
diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
index 018948a1..409165bb 100644
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@@ -7,7 +7,7 @@
           %br
           %small
             = @event.subtitle
-        = link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success pull-right"
+        = link_to "Schedule", schedule_conference_path(@conference.short_title), :class =>"btn btn-success pull-right"
         - if can? :edit, @event
           = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
   .row
diff --git a/app/views/tickets/_ticket.html.haml b/app/views/tickets/_ticket.html.haml
index 9f2d731f..c31703b3 100644
--- a/app/views/tickets/_ticket.html.haml
+++ b/app/views/tickets/_ticket.html.haml
@@ -10,10 +10,10 @@
   %td.col-sm-1.col-md-1
     - if ticket.bought?(current_user)
       = text_field_tag("tickets[][#{ticket.id}]", ticket.quantity_bought_by(current_user),
-      type: 'number', min: 0, class: 'form-control quantity', 'data-id' => ticket.id)
+      type: 'number', min: 0, class: "form-control quantity", 'data-id' => ticket.id)
     - else
       = text_field_tag("tickets[][#{ticket.id}]", 0, type: 'number', min: 0,
-      class: 'form-control quantity', 'data-id' => ticket.id)
+      class: "form-control quantity", 'data-id' => ticket.id)
   %td.col-sm-1.col-md-1.text-center
     = ticket.price.symbol
     %span{id: "price_#{ticket.id}"}
diff --git a/app/views/tickets/index.html.haml b/app/views/tickets/index.html.haml
index bf916484..5dec92d7 100644
--- a/app/views/tickets/index.html.haml
+++ b/app/views/tickets/index.html.haml
@@ -5,9 +5,10 @@
         %h1
           Tickets
       %p.lead
-        Please buy a ticket to support
-        %b
+        Support
+        %strong
           = @conference.title
+        by buying a ticket
       =form_tag(conference_ticket_purchases_path, method: :post) do |f|
         %table.table.table-hover
           %thead
@@ -17,8 +18,8 @@
               %th Price
               %th Total
           %tbody
-            - @conference.tickets.each do |ticket|
-              = render partial: 'ticket', f: f, locals: {ticket: ticket}
+          - @conference.tickets.each do |ticket|
+            = render partial: 'ticket', f: f, locals: {ticket: ticket}
             %tr
               %td
               %td
@@ -28,11 +29,18 @@
               %td.col-sm-1.col-md-1.text-center
                 %h4
                   %strong
+                    = @conference.tickets.first.price.symbol
                     %span{id: 'total_price'}
                       0
         .pull-right
-          = button_tag(type: 'submit', class: 'btn btn-success btn-lg') do
-            Support
-            %i.fa.fa-shopping-cart
-          = link_to 'Continue without a Ticket!', conference_conference_registrations_path(@conference.short_title),
-          class: 'btn btn-danger btn-sm'
+          .btn-group-vertical
+            = button_tag(type: 'submit', class: 'btn btn-success btn-lg') do
+              Support
+              %i.fa.fa-shopping-cart
+            = link_to 'Continue without a Ticket!', conference_conference_registrations_path(@conference.short_title),
+            class: 'btn btn-danger btn-sm'
+  .row
+    .col-md-13
+      %p.text-muted.text-center
+        %small
+          Checkout will be at the conference registration
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index f026f5ba..2a5cbcd0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,10 +58,10 @@ Osem::Application.routes.draw do
       resources :emails, only: [:show, :update, :index]
 
       resources :sponsorship_levels, except: [:show] do
-	member do
-	  patch :up
-	  patch :down
-	end
+        member do
+          patch :up
+          patch :down
+        end
       end
 
       resources :questions do
@@ -101,12 +101,8 @@ Osem::Application.routes.draw do
     resources :ticket_purchases, only: [:create, :destroy]
     resource :subscriptions, only: [:create, :destroy]
 
-    resource :schedule, only: [] do
-      get '/' => 'schedule#index'
-    end
-
     member do
-      get 'gallery_photos'
+      get :schedule
     end
   end
 
diff --git a/spec/factories/tickets.rb b/spec/factories/tickets.rb
index 1e3105cc..bd0679c3 100644
--- a/spec/factories/tickets.rb
+++ b/spec/factories/tickets.rb
@@ -3,6 +3,5 @@ FactoryGirl.define do
     title 'Business Ticket'
     price_cents 1000
     price_currency 'USD'
-    conference
   end
 end
diff --git a/spec/features/ability_spec.rb b/spec/features/ability_spec.rb
index 453321b7..2ae0e5c7 100644
--- a/spec/features/ability_spec.rb
+++ b/spec/features/ability_spec.rb
@@ -16,6 +16,7 @@ feature 'Has correct abilities' do
   let(:user) { create(:user, role_ids: [role_organizer.id, role_cfp.id, role_info_desk.id, role_volunteer_coordinator.id]) }
 
   scenario 'when user is organizer' do
+    user.is_admin = false
     sign_in user
     visit admin_conference_path(conference1.short_title)
 
@@ -86,6 +87,7 @@ feature 'Has correct abilities' do
   end
 
   scenario 'when user is cfp' do
+    user.is_admin = false
     sign_in user
     visit admin_conference_path(conference2.short_title)
 
@@ -156,6 +158,7 @@ feature 'Has correct abilities' do
   end
 
   scenario 'when user is info desk' do
+    user.is_admin = false
     sign_in user
     visit admin_conference_path(conference3.short_title)
 
@@ -227,6 +230,7 @@ feature 'Has correct abilities' do
   end
 
   scenario 'when user is volunteer coordinator' do
+    user.is_admin = false
     sign_in user
     visit admin_conference_path(conference4.short_title)
 
diff --git a/spec/features/conference_registration_spec.rb b/spec/features/conference_registration_spec.rb
index 72c2e590..b1ab5f08 100644
--- a/spec/features/conference_registration_spec.rb
+++ b/spec/features/conference_registration_spec.rb
@@ -18,21 +18,22 @@ feature Registration do
 
       scenario 'updates conference registration', feature: true, js: true do
         visit root_path
-        click_link 'Modify Registration'
+        click_link 'My Registration'
+        expect(current_path).to eq(conference_conference_registrations_path(conference.short_title))
 
+        click_link 'Edit your Registration'
         expect(current_path).to eq(edit_conference_conference_registrations_path(conference.short_title))
-        click_button 'Update Registration'
 
+        click_button 'Update Registration'
         expect(conference.user_registered?(participant)).to be(true)
       end
 
       scenario 'unregisters for a conference', feature: true, js: true do
         visit root_path
-        click_link 'Modify Registration'
+        click_link 'My Registration'
+        expect(current_path).to eq(conference_conference_registrations_path(conference.short_title))
 
-        expect(current_path).to eq(edit_conference_conference_registrations_path(conference.short_title))
         click_link 'Unregister'
-
         expect(conference.user_registered?(participant)).to be(false)
       end
     end
diff --git a/spec/features/difficulty_levels_spec.rb b/spec/features/difficulty_levels_spec.rb
index d23f3979..d670d29a 100644
--- a/spec/features/difficulty_levels_spec.rb
+++ b/spec/features/difficulty_levels_spec.rb
@@ -26,7 +26,7 @@ feature DifficultyLevel do
       within('table#difficulty_levels') do
         expect(page.has_content?('Hard')).to be true
         expect(page.has_content?('Life is the hardest')).to be true
-        expect(page.assert_selector('tr', count: 2)).to be true
+        expect(page.assert_selector('tr', count: 5)).to be true
       end
     end
 
@@ -38,12 +38,17 @@ feature DifficultyLevel do
                 conference_id: conference.short_title)
 
       # Remove difficulty level
-      click_link 'Delete'
+      within('table tr:nth-of-type(4)') do
+        click_link 'Delete'
+      end
 
       # Validations
       expect(flash).to eq('Difficulty level successfully deleted.')
       within('table#difficulty_levels') do
-        expect(page.assert_selector('tr', count: 1)).to be true
+        expect(page.assert_selector('tr', count: 4)).to be true
+        expect(page.has_content?('Easy Events')).to be true
+        expect(page.has_content?('Medium Events')).to be true
+        expect(page.has_content?('Hard Events')).to be true
       end
     end
 
diff --git a/spec/features/ticket_purchases_spec.rb b/spec/features/ticket_purchases_spec.rb
index ae782f9e..b8c8ecbe 100644
--- a/spec/features/ticket_purchases_spec.rb
+++ b/spec/features/ticket_purchases_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature Registration do
   let!(:ticket) { create(:ticket) }
-  let!(:conference) { create(:conference, title: 'ExampleCon', tickets: [ticket]) }
+  let!(:conference) { create(:conference, title: 'ExampleCon', tickets: [ticket], registration_period: create(:registration_period, start_date: 3.days.ago)) }
   let!(:participant) { create(:user) }
 
   context 'as a participant' do
@@ -18,7 +18,10 @@ feature Registration do
 
       scenario 'purchases a ticket', feature: true, js: true do
         visit root_path
-        click_link 'Support'
+        click_link 'Register'
+
+        expect(current_path).to eq(new_conference_conference_registrations_path(conference.short_title))
+        click_button 'Register'
 
         fill_in "tickets__#{ticket.id}", with: '2'
         expect(current_path).to eq(conference_tickets_path(conference.short_title))
@@ -29,20 +32,18 @@ feature Registration do
         expect(purchase.quantity).to eq(2)
         expect(current_path).to eq(conference_conference_registrations_path(conference.short_title))
         expect(flash).
-            to eq('Congratulations, you have successfully purchased a ticket! You can pay for it in cash when you arrive! Thank you for supporting ExampleCon!')
-        expect(page.has_content?('Business Ticket')).to be true
+            to eq("Thank you for supporting #{conference.title} by purchasing a ticket.")
+        expect(page.has_content?('2 Business Ticket Tickets for 10')).to be true
       end
 
       scenario 'deletes a purchased ticket', feature: true, js: true do
-        create(:ticket_purchase,
-               user_id: participant.id,
-               ticket_id: ticket.id,
-               quantity: 2)
+        create(:registration, conference: conference, user: participant)
+        create(:ticket_purchase, conference: conference, user: participant, ticket: ticket, quantity: 4)
 
         visit conference_conference_registrations_path(conference.short_title)
-        expect(page.has_content?('Business Ticket')).to be true
+        expect(page.has_content?('4 Business Ticket Tickets for 10')).to be true
 
-        click_link 'Delete'
+        click_link "ticket-#{ticket.id}-delete"
         expect(flash).to eq('Ticket successfully deleted.')
         expect(TicketPurchase.count).to eq(0)
       end
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index ceac8876..256585be 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -7,7 +7,7 @@ describe 'User' do
     let!(:first_user) { create(:user) } # automatically becomes admin
     let(:user){ nil }
     let(:conference_not_public) { create(:conference, splashpage: create(:splashpage, public: false)) }
-    let(:conference_public) { create(:conference, splashpage: create(:splashpage, public: true)) }
+    let(:conference_public) { create(:conference, splashpage: create(:splashpage, public: true), call_for_paper: create(:call_for_paper, schedule_public: true)) }
     let(:event_confirmed) { create(:event, state: 'confirmed') }
     let(:someevent) { create(:event) }
 
@@ -19,7 +19,7 @@ describe 'User' do
       it{ should be_able_to(:show, event_confirmed)}
       it{ should_not be_able_to(:show, someevent)}
 
-      it{ should be_able_to(:index, :schedule)}
+      it{ should be_able_to(:schedule, conference_public)}
 
       it{ should_not be_able_to(:create, Event)}
       it{ should_not be_able_to(:manage, Event)}