diff --git a/external/jquery/addons/css/images/alert.png b/external/jquery/addons/css/images/alert.png
new file mode 100644
index 0000000000..c37bd062e6
Binary files /dev/null and b/external/jquery/addons/css/images/alert.png differ
diff --git a/external/jquery/addons/css/images/error.png b/external/jquery/addons/css/images/error.png
new file mode 100644
index 0000000000..94af849e72
Binary files /dev/null and b/external/jquery/addons/css/images/error.png differ
diff --git a/external/jquery/addons/css/jquery.stepy.css b/external/jquery/addons/css/jquery.stepy.css
new file mode 100644
index 0000000000..23a02887ca
--- /dev/null
+++ b/external/jquery/addons/css/jquery.stepy.css
@@ -0,0 +1,134 @@
+.stepy-header {
+	margin      : 0;
+	padding     : 0;
+	width       : 724px;
+	margin-left : 0;
+}
+
+.stepy-header li {
+	color      : #DDDDDD;
+	list-style : none;
+	cursor     : pointer;
+	float      : left;
+	padding    : 10px
+}
+
+.stepy-header li.stepy-error {
+	background : url('images/error.png') no-repeat right top
+}
+
+.stepy-header li div {
+	color : #CCC;
+	font  : bold 1.5em verdana;
+	/*text-shadow : 1px 1px #F8F8F8*/
+}
+
+.stepy-header li.stepy-active div {
+	color  : #369;
+	cursor : auto
+}
+
+.stepy-header li span {
+	color : #CCC;
+	font  : 1.2em verdana
+}
+
+.stepy-header li.stepy-active span {
+	color : #BBB
+}
+
+.stepy-step {
+	border                : 1px solid #BBB;
+	clear                 : left;
+	padding               : 0 20px;
+	width                 : 600px;
+	-khtml-border-radius  : 3px;
+	-moz-border-radius    : 3px;
+	-opera-border-radius  : 3px;
+	-webkit-border-radius : 3px;
+	border-radius         : 3px
+}
+
+.stepy-step legend {
+	color          : #4080BF;
+	font           : bold 1.0em arial;
+	letter-spacing : .7px;
+	padding        : 0 5px 5px;
+	width          : auto;
+	margin-bottom  : 12px;
+	border-bottom  : 0;
+}
+
+.stepy-step label {
+	/*color          : #222;*/
+	display        : block;
+	/*font           : bold 1.5em arial;*/
+	letter-spacing : .7px;
+	margin         : 10px 0 3px 1px
+}
+
+.stepy-navigator {
+	height     : 33px;
+	margin-top : 20px
+}
+
+.button-back {
+	float : left
+}
+
+.finish,
+.button-next,
+.stepy-navigator input[type="submit"] {
+	float : right
+}
+
+.button-back,
+.button-next,
+.stepy-navigator input[type="submit"] {
+	border                : 1px solid #CCC;
+	color                 : #7F0055;
+	cursor                : pointer;
+	font                  : 1.2em verdana;
+	padding               : 7px 15px 8px;
+	text-decoration       : none;
+	-khtml-border-radius  : 3px;
+	-moz-border-radius    : 3px;
+	-opera-border-radius  : 3px;
+	-webkit-border-radius : 3px;
+	border-radius         : 3px
+}
+
+.stepy-navigator input[type="submit"] {
+	background-color : transparent;
+	border-color     : #CCC;
+	margin-bottom    : 0;
+	padding          : 7px 15px 24px;
+	width            : 90px
+}
+
+.button-back:hover,
+.button-next:hover,
+.stepy-navigator input[type="submit"]:hover {
+	border-color : #BBB;
+	color        : #B07
+}
+
+.error-image {
+	background : url("images/error.png") no-repeat scroll right top transparent;
+}
+
+.error {
+	background-color : #FAF4F4;
+}
+
+label.error {
+	background   : url("images/alert.png") no-repeat scroll 0 0 transparent;
+	color        : #DE5130;
+	display      : block;
+	float        : right;
+	font         : 10px verdana;
+	height       : 13px;
+	margin       : 3px 3px 0 10px;
+	padding-left : 21px;
+	padding-top  : 2px;
+}
diff --git a/external/jquery/addons/js/jquery.stepy.js b/external/jquery/addons/js/jquery.stepy.js
new file mode 100644
index 0000000000..4672323dc9
--- /dev/null
+++ b/external/jquery/addons/js/jquery.stepy.js
@@ -0,0 +1,410 @@
+/*!
+ * jQuery Stepy - A Wizard Plugin
+ * --------------------------------------------------------------
+ *
+ * jQuery Stepy is a plugin that generates a customizable wizard.
+ *
+ * Licensed under The MIT License
+ *
+ * @version        1.1.0
+ * @since          2010-07-03
+ * @author         Washington Botelho
+ * @documentation  wbotelhos.com/stepy
+ *
+ * --------------------------------------------------------------
+ *
+ *  <form>
+ *    <fieldset title="Step 1">
+ *      <legend>description one</legend>
+ *      <!-- inputs -->
+ *    </fieldset>
+ *
+ *    <fieldset title="Step 2">
+ *      <legend>description two</legend>
+ *      <!-- inputs -->
+ *    </fieldset>
+ *
+ *    <input type="submit" />
+ *  </form>
+ *
+ *  $('form').stepy();
+ *
+ */
+
+;
+(function ($) {
+
+    var methods = {
+        init: function (settings) {
+            return this.each(function () {
+                methods.destroy.call(this);
+
+                this.opt = $.extend({}, $.fn.stepy.defaults, settings);
+
+                var self = this,
+                    that = $(this),
+                    id = that.attr('id');
+
+                if (id === undefined || id === '') {
+                    var id = methods._hash.call(self);
+
+                    that.attr('id', id);
+                }
+
+                if (self.opt.validate) {
+                    jQuery.validator.setDefaults({ ignore: self.opt.ignore });
+
+                    that.append('<div class="stepy-error" />');
+                }
+
+                self.header = methods._header.call(self);
+                self.steps = that.children('fieldset');
+
+                self.steps.each(function (index) {
+                    methods._createHead.call(self, this, index);
+                    methods._createButtons.call(self, this, index);
+                });
+
+                self.heads = self.header.children('li');
+
+                self.heads.first().addClass('stepy-active');
+
+                if (self.opt.finishButton) {
+                    methods._bindFinish.call(self);
+                }
+
+                if (self.opt.titleClick) {
+                    self.heads.click(function () {
+                        var array = self.heads.filter('.stepy-active').attr('id').split('-'), // TODO: try keep the number in an attribute.
+                            current = parseInt(array[array.length - 1], 10),
+                            clicked = $(this).index();
+
+                        if (clicked > current) {
+                            if (self.opt.next && !methods._execute.call(that, self.opt.next, clicked)) {
+                                return false;
+                            }
+                        } else if (clicked < current) {
+                            if (self.opt.back && !methods._execute.call(that, self.opt.back, clicked)) {
+                                return false;
+                            }
+                        }
+
+                        if (clicked != current) {
+                            methods.step.call(self, (clicked) + 1);
+                        }
+                    });
+                } else {
+                    self.heads.css('cursor', 'default');
+                }
+
+                if (self.opt.enter) {
+                    methods._bindEnter.call(self);
+                }
+
+                self.steps.first().find(':input:visible:enabled').first().select().focus();
+
+                that.data({ 'settings': this.opt, 'stepy': true });
+            });
+        }, _bindEnter: function () {
+            var self = this;
+
+            self.steps.delegate('input[type="text"], input[type="password"]', 'keypress', function (evt) {
+                var key = (evt.keyCode ? evt.keyCode : evt.which);
+
+                if (key == 13) {
+                    evt.preventDefault();
+
+                    var buttons = $(this).closest('fieldset').find('.stepy-navigator');
+
+                    if (buttons.length) {
+                        var next = buttons.children('.button-next');
+
+                        if (next.length) {
+                            next.click();
+                        } else if (self.finish) {
+                            self.finish.click();
+                        }
+                    }
+                }
+            });
+        }, _bindFinish: function () {
+            var self = this,
+                that = $(this),
+                finish = $(':submit', that);
+
+            self.finish = (finish.length === 1) ? finish : that.children('.stepy-finish');
+
+            if (self.finish.length) {
+                var isForm = that.is('form'),
+                    onSubmit = undefined;
+
+                if (isForm && self.opt.finish) {
+                    onSubmit = that.attr('onsubmit');
+
+                    that.attr('onsubmit', 'return false;');
+                }
+
+                self.finish.on('click.stepy', function (evt) {
+                    if (self.opt.finish && !methods._execute.call(that, self.opt.finish, self.steps.length - 1)) {
+                        evt.preventDefault();
+                    } else if (isForm) {
+                        if (onSubmit) {
+                            that.attr('onsubmit', onSubmit);
+                        } else {
+                            that.removeAttr('onsubmit');
+                        }
+
+                        var isSubmit = self.finish.attr('type') === 'submit';
+
+                        if (!isSubmit && (!self.opt.validate || methods.validate.call(that, self.steps.length - 1))) {
+                            that.submit();
+                        }
+                    }
+                });
+
+                self.steps.last().children('.stepy-navigator').append(self.finish);
+            } else {
+                $.error('Submit button or element with class "stepy-finish" missing!');
+            }
+        }, _createBackButton: function (nav, index) {
+            var self = this,
+                that = $(this),
+                attributes = { href: 'javascript:void(0);', 'class': 'button-back '+self.opt.btnClass, html: self.opt.backLabel };
+
+            $('<a />', attributes).on('click.stepy',function () {
+                if (!self.opt.back || methods._execute.call(self, self.opt.back, index - 1)) {
+                    methods.step.call(self, (index - 1) + 1);
+                }
+            }).appendTo(nav);
+        }, _createButtons: function (step, index) {
+            var nav = methods._navigator.call(this).appendTo(step);
+
+            if (index === 0) {
+                if (this.steps.length > 1) {
+                    methods._createNextButton.call(this, nav, index);
+                }
+            } else {
+                $(step).hide();
+
+                methods._createBackButton.call(this, nav, index);
+
+                if (index < this.steps.length - 1) {
+                    methods._createNextButton.call(this, nav, index);
+                }
+            }
+        }, _createHead: function (step, index) {
+            var step = $(step).attr('id', $(this).attr('id') + '-step-' + index).addClass('stepy-step'),
+                head = methods._head.call(this, index);
+
+            head.append(methods._title.call(this, step));
+
+            if (this.opt.description) {
+                head.append(methods._description.call(this, step));
+            }
+
+            this.header.append(head);
+        }, _createNextButton: function (nav, index) {
+            var self = this,
+                that = $(this),
+                attributes = { href: 'javascript:void(0);', 'class': 'button-next '+self.opt.btnClass, html: self.opt.nextLabel };
+
+            $('<a/>', attributes).on('click.stepy',function () {
+                if (!self.opt.next || methods._execute.call(that, self.opt.next, index + 1)) {
+                    methods.step.call(self, (index + 1) + 1);
+                }
+            }).appendTo(nav);
+        }, _description: function (step) {
+            var legend = step.children('legend');
+
+            if (!this.opt.legend) {
+                legend.hide();
+            }
+
+            if (legend.length) {
+                return $('<span />', { html: legend.html() });
+            }
+
+            methods._error.call(this, '<legend /> element missing!');
+        }, _error: function (message) {
+            $(this).html(message);
+
+            $.error(message);
+        }, _execute: function (callback, index) {
+            var isValid = callback.call(this, index + 1);
+
+            return isValid || isValid === undefined;
+        }, _hash: function () {
+            this.hash = 'stepy-' + Math.random().toString().substring(2)
+
+            return this.hash;
+        }, _head: function (index) {
+            return $('<li />', { id: $(this).attr('id') + '-head-' + index });
+        }, _header: function () {
+            var header = $('<ul />', { id: $(this).attr('id') + '-header', 'class': 'stepy-header' });
+
+            if (this.opt.titleTarget) {
+                header.appendTo(this.opt.titleTarget);
+            } else {
+                header.insertBefore(this);
+            }
+
+            return header;
+        }, _navigator: function (index) {
+            return $('<p class="stepy-navigator" />');
+        }, _title: function (step) {
+            return $('<div />', { html: step.attr('title') || '--' });
+        }, destroy: function () {
+            return $(this).each(function () {
+                var that = $(this);
+
+                if (that.data('stepy')) {
+                    var steps = that.data('stepy', false).children('fieldset').css('display', '');
+
+                    that.children('.stepy-error').remove();
+                    this.finish.appendTo(steps.last());
+                    steps.find('p.stepy-navigator').remove();
+                }
+            });
+        }, step: function (index) {
+            var self = this
+            that = $(this),
+                opt = that[0].opt;
+
+            index--;
+
+            var steps = that.children('fieldset');
+
+            if (index > steps.length - 1) {
+                index = steps.length - 1;
+            }
+
+            var max = index;
+
+            if (opt.validate) {
+                var isValid = true;
+
+                for (var i = 0; i < index; i++) {
+                    isValid &= methods.validate.call(this, i);
+
+                    if (opt.block && !isValid) {
+                        max = i;
+                        break;
+                    }
+                }
+            }
+
+            if (opt.transition == 'fade') {
+                var stepsCount = steps.length;
+
+                steps.fadeOut(opt.duration, function () {
+                    if (--stepsCount > 0) {
+                        return;
+                    }
+
+                    steps.eq(max).fadeIn(opt.duration);
+                });
+            } else if (opt.transition == 'slide') {
+                var stepsCount = steps.length;
+
+                steps.slideUp(opt.duration, function () {
+                    if (--stepsCount > 0) {
+                        return;
+                    }
+
+                    steps.eq(max).slideDown(opt.duration);
+                });
+            } else {
+                steps.hide(opt.duration).eq(max).show(opt.duration);
+            }
+
+            that[0].heads.removeClass('stepy-active').eq(max).addClass('stepy-active');
+
+            if (that.is('form')) {
+                var $fields = undefined;
+
+                if (max == index) {
+                    $fields = steps.eq(max).find(':input:enabled:visible');
+                } else {
+                    $fields = steps.eq(max).find('.error').select().focus();
+                }
+
+                $fields.first().select().focus();
+            }
+
+            if (opt.select) {
+                opt.select.call(this, max + 1);
+            }
+
+            return that;
+        }, validate: function (index) {
+            var that = $(this);
+
+            if (!that.is('form')) {
+                return true;
+            }
+
+            var self = this,
+                step = that.children('fieldset').eq(index),
+                isValid = true,
+                $title = $('#' + that.attr('id') + '-header').children().eq(index),
+                $validate = that.validate();
+
+            $(step.find(':input:enabled').get().reverse()).each(function () {
+                var fieldIsValid = $validate.element($(this));
+
+                if (fieldIsValid === undefined) {
+                    fieldIsValid = true;
+                }
+
+                isValid &= fieldIsValid;
+
+                if (isValid) {
+                    if (self.opt.errorImage) {
+                        $title.removeClass('stepy-error');
+                    }
+                } else {
+                    if (self.opt.errorImage) {
+                        $title.addClass('stepy-error');
+                    }
+
+                    $validate.focusInvalid();
+                }
+            });
+
+            return isValid;
+        }
+    };
+
+    $.fn.stepy = function (method) {
+        if (methods[method]) {
+            return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+        } else if (typeof method === 'object' || !method) {
+            return methods.init.apply(this, arguments);
+        } else {
+            $.error('Method ' + method + ' does not exist!');
+        }
+    };
+
+    $.fn.stepy.defaults = {
+        back: undefined,
+        backLabel: '&lt; Back',
+        block: false,
+        btnClass: '',
+        description: true,
+        duration: 0,
+        enter: true,
+        errorImage: false,
+        finish: undefined,
+        finishButton: true,
+        ignore: '',
+        legend: true,
+        next: undefined,
+        nextLabel: 'Next &gt;',
+        select: undefined,
+        titleClick: false,
+        titleTarget: undefined,
+        transition: 'hide',
+        validate: false
+    };
+
+})(jQuery);
diff --git a/external/jquery/addons/js/jquery.validate.js b/external/jquery/addons/js/jquery.validate.js
new file mode 100644
index 0000000000..88ba300ea9
--- /dev/null
+++ b/external/jquery/addons/js/jquery.validate.js
@@ -0,0 +1,1231 @@
+/*!
+ * jQuery Validation Plugin 1.11.1
+ *
+ * http://bassistance.de/jquery-plugins/jquery-plugin-validation/
+ * http://docs.jquery.com/Plugins/Validation
+ *
+ * Copyright 2013 Jörn Zaefferer
+ * Released under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ */
+
+(function($) {
+
+$.extend($.fn, {
+	// http://docs.jquery.com/Plugins/Validation/validate
+	validate: function( options ) {
+
+		// if nothing is selected, return nothing; can't chain anyway
+		if ( !this.length ) {
+			if ( options && options.debug && window.console ) {
+				console.warn( "Nothing selected, can't validate, returning nothing." );
+			}
+			return;
+		}
+
+		// check if a validator for this form was already created
+		var validator = $.data( this[0], "validator" );
+		if ( validator ) {
+			return validator;
+		}
+
+		// Add novalidate tag if HTML5.
+		this.attr( "novalidate", "novalidate" );
+
+		validator = new $.validator( options, this[0] );
+		$.data( this[0], "validator", validator );
+
+		if ( validator.settings.onsubmit ) {
+
+			this.validateDelegate( ":submit", "click", function( event ) {
+				if ( validator.settings.submitHandler ) {
+					validator.submitButton = event.target;
+				}
+				// allow suppressing validation by adding a cancel class to the submit button
+				if ( $(event.target).hasClass("cancel") ) {
+					validator.cancelSubmit = true;
+				}
+
+				// allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
+				if ( $(event.target).attr("formnovalidate") !== undefined ) {
+					validator.cancelSubmit = true;
+				}
+			});
+
+			// validate the form on submit
+			this.submit( function( event ) {
+				if ( validator.settings.debug ) {
+					// prevent form submit to be able to see console output
+					event.preventDefault();
+				}
+				function handle() {
+					var hidden;
+					if ( validator.settings.submitHandler ) {
+						if ( validator.submitButton ) {
+							// insert a hidden input as a replacement for the missing submit button
+							hidden = $("<input type='hidden'/>").attr("name", validator.submitButton.name).val( $(validator.submitButton).val() ).appendTo(validator.currentForm);
+						}
+						validator.settings.submitHandler.call( validator, validator.currentForm, event );
+						if ( validator.submitButton ) {
+							// and clean up afterwards; thanks to no-block-scope, hidden can be referenced
+							hidden.remove();
+						}
+						return false;
+					}
+					return true;
+				}
+
+				// prevent submit for invalid forms or custom submit handlers
+				if ( validator.cancelSubmit ) {
+					validator.cancelSubmit = false;
+					return handle();
+				}
+				if ( validator.form() ) {
+					if ( validator.pendingRequest ) {
+						validator.formSubmitted = true;
+						return false;
+					}
+					return handle();
+				} else {
+					validator.focusInvalid();
+					return false;
+				}
+			});
+		}
+
+		return validator;
+	},
+	// http://docs.jquery.com/Plugins/Validation/valid
+	valid: function() {
+		if ( $(this[0]).is("form")) {
+			return this.validate().form();
+		} else {
+			var valid = true;
+			var validator = $(this[0].form).validate();
+			this.each(function() {
+				valid = valid && validator.element(this);
+			});
+			return valid;
+		}
+	},
+	// attributes: space seperated list of attributes to retrieve and remove
+	removeAttrs: function( attributes ) {
+		var result = {},
+			$element = this;
+		$.each(attributes.split(/\s/), function( index, value ) {
+			result[value] = $element.attr(value);
+			$element.removeAttr(value);
+		});
+		return result;
+	},
+	// http://docs.jquery.com/Plugins/Validation/rules
+	rules: function( command, argument ) {
+		var element = this[0];
+
+		if ( command ) {
+			var settings = $.data(element.form, "validator").settings;
+			var staticRules = settings.rules;
+			var existingRules = $.validator.staticRules(element);
+			switch(command) {
+			case "add":
+				$.extend(existingRules, $.validator.normalizeRule(argument));
+				// remove messages from rules, but allow them to be set separetely
+				delete existingRules.messages;
+				staticRules[element.name] = existingRules;
+				if ( argument.messages ) {
+					settings.messages[element.name] = $.extend( settings.messages[element.name], argument.messages );
+				}
+				break;
+			case "remove":
+				if ( !argument ) {
+					delete staticRules[element.name];
+					return existingRules;
+				}
+				var filtered = {};
+				$.each(argument.split(/\s/), function( index, method ) {
+					filtered[method] = existingRules[method];
+					delete existingRules[method];
+				});
+				return filtered;
+			}
+		}
+
+		var data = $.validator.normalizeRules(
+		$.extend(
+			{},
+			$.validator.classRules(element),
+			$.validator.attributeRules(element),
+			$.validator.dataRules(element),
+			$.validator.staticRules(element)
+		), element);
+
+		// make sure required is at front
+		if ( data.required ) {
+			var param = data.required;
+			delete data.required;
+			data = $.extend({required: param}, data);
+		}
+
+		return data;
+	}
+});
+
+// Custom selectors
+$.extend($.expr[":"], {
+	// http://docs.jquery.com/Plugins/Validation/blank
+	blank: function( a ) { return !$.trim("" + $(a).val()); },
+	// http://docs.jquery.com/Plugins/Validation/filled
+	filled: function( a ) { return !!$.trim("" + $(a).val()); },
+	// http://docs.jquery.com/Plugins/Validation/unchecked
+	unchecked: function( a ) { return !$(a).prop("checked"); }
+});
+
+// constructor for validator
+$.validator = function( options, form ) {
+	this.settings = $.extend( true, {}, $.validator.defaults, options );
+	this.currentForm = form;
+	this.init();
+};
+
+$.validator.format = function( source, params ) {
+	if ( arguments.length === 1 ) {
+		return function() {
+			var args = $.makeArray(arguments);
+			args.unshift(source);
+			return $.validator.format.apply( this, args );
+		};
+	}
+	if ( arguments.length > 2 && params.constructor !== Array  ) {
+		params = $.makeArray(arguments).slice(1);
+	}
+	if ( params.constructor !== Array ) {
+		params = [ params ];
+	}
+	$.each(params, function( i, n ) {
+		source = source.replace( new RegExp("\\{" + i + "\\}", "g"), function() {
+			return n;
+		});
+	});
+	return source;
+};
+
+$.extend($.validator, {
+
+	defaults: {
+		messages: {},
+		groups: {},
+		rules: {},
+		errorClass: "error",
+		validClass: "valid",
+		errorElement: "label",
+		focusInvalid: true,
+		errorContainer: $([]),
+		errorLabelContainer: $([]),
+		onsubmit: true,
+		ignore: ":hidden",
+		ignoreTitle: false,
+		onfocusin: function( element, event ) {
+			this.lastActive = element;
+
+			// hide error label and remove error class on focus if enabled
+			if ( this.settings.focusCleanup && !this.blockFocusCleanup ) {
+				if ( this.settings.unhighlight ) {
+					this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
+				}
+				this.addWrapper(this.errorsFor(element)).hide();
+			}
+		},
+		onfocusout: function( element, event ) {
+			if ( !this.checkable(element) && (element.name in this.submitted || !this.optional(element)) ) {
+				this.element(element);
+			}
+		},
+		onkeyup: function( element, event ) {
+			if ( event.which === 9 && this.elementValue(element) === "" ) {
+				return;
+			} else if ( element.name in this.submitted || element === this.lastElement ) {
+				this.element(element);
+			}
+		},
+		onclick: function( element, event ) {
+			// click on selects, radiobuttons and checkboxes
+			if ( element.name in this.submitted ) {
+				this.element(element);
+			}
+			// or option elements, check parent select in that case
+			else if ( element.parentNode.name in this.submitted ) {
+				this.element(element.parentNode);
+			}
+		},
+		highlight: function( element, errorClass, validClass ) {
+			if ( element.type === "radio" ) {
+				this.findByName(element.name).addClass(errorClass).removeClass(validClass);
+			} else {
+				$(element).addClass(errorClass).removeClass(validClass);
+			}
+		},
+		unhighlight: function( element, errorClass, validClass ) {
+			if ( element.type === "radio" ) {
+				this.findByName(element.name).removeClass(errorClass).addClass(validClass);
+			} else {
+				$(element).removeClass(errorClass).addClass(validClass);
+			}
+		}
+	},
+
+	// http://docs.jquery.com/Plugins/Validation/Validator/setDefaults
+	setDefaults: function( settings ) {
+		$.extend( $.validator.defaults, settings );
+	},
+
+	messages: {
+		required: "This field is required.",
+		remote: "Please fix this field.",
+		email: "Please enter a valid email address.",
+		url: "Please enter a valid URL.",
+		date: "Please enter a valid date.",
+		dateISO: "Please enter a valid date (ISO).",
+		number: "Please enter a valid number.",
+		digits: "Please enter only digits.",
+		creditcard: "Please enter a valid credit card number.",
+		equalTo: "Please enter the same value again.",
+		maxlength: $.validator.format("Please enter no more than {0} characters."),
+		minlength: $.validator.format("Please enter at least {0} characters."),
+		rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),
+		range: $.validator.format("Please enter a value between {0} and {1}."),
+		max: $.validator.format("Please enter a value less than or equal to {0}."),
+		min: $.validator.format("Please enter a value greater than or equal to {0}.")
+	},
+
+	autoCreateRanges: false,
+
+	prototype: {
+
+		init: function() {
+			this.labelContainer = $(this.settings.errorLabelContainer);
+			this.errorContext = this.labelContainer.length && this.labelContainer || $(this.currentForm);
+			this.containers = $(this.settings.errorContainer).add( this.settings.errorLabelContainer );
+			this.submitted = {};
+			this.valueCache = {};
+			this.pendingRequest = 0;
+			this.pending = {};
+			this.invalid = {};
+			this.reset();
+
+			var groups = (this.groups = {});
+			$.each(this.settings.groups, function( key, value ) {
+				if ( typeof value === "string" ) {
+					value = value.split(/\s/);
+				}
+				$.each(value, function( index, name ) {
+					groups[name] = key;
+				});
+			});
+			var rules = this.settings.rules;
+			$.each(rules, function( key, value ) {
+				rules[key] = $.validator.normalizeRule(value);
+			});
+
+			function delegate(event) {
+				var validator = $.data(this[0].form, "validator"),
+					eventType = "on" + event.type.replace(/^validate/, "");
+				if ( validator.settings[eventType] ) {
+					validator.settings[eventType].call(validator, this[0], event);
+				}
+			}
+			$(this.currentForm)
+				.validateDelegate(":text, [type='password'], [type='file'], select, textarea, " +
+					"[type='number'], [type='search'] ,[type='tel'], [type='url'], " +
+					"[type='email'], [type='datetime'], [type='date'], [type='month'], " +
+					"[type='week'], [type='time'], [type='datetime-local'], " +
+					"[type='range'], [type='color'] ",
+					"focusin focusout keyup", delegate)
+				.validateDelegate("[type='radio'], [type='checkbox'], select, option", "click", delegate);
+
+			if ( this.settings.invalidHandler ) {
+				$(this.currentForm).bind("invalid-form.validate", this.settings.invalidHandler);
+			}
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/form
+		form: function() {
+			this.checkForm();
+			$.extend(this.submitted, this.errorMap);
+			this.invalid = $.extend({}, this.errorMap);
+			if ( !this.valid() ) {
+				$(this.currentForm).triggerHandler("invalid-form", [this]);
+			}
+			this.showErrors();
+			return this.valid();
+		},
+
+		checkForm: function() {
+			this.prepareForm();
+			for ( var i = 0, elements = (this.currentElements = this.elements()); elements[i]; i++ ) {
+				this.check( elements[i] );
+			}
+			return this.valid();
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/element
+		element: function( element ) {
+			element = this.validationTargetFor( this.clean( element ) );
+			this.lastElement = element;
+			this.prepareElement( element );
+			this.currentElements = $(element);
+			var result = this.check( element ) !== false;
+			if ( result ) {
+				delete this.invalid[element.name];
+			} else {
+				this.invalid[element.name] = true;
+			}
+			if ( !this.numberOfInvalids() ) {
+				// Hide error containers on last error
+				this.toHide = this.toHide.add( this.containers );
+			}
+			this.showErrors();
+			return result;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/showErrors
+		showErrors: function( errors ) {
+			if ( errors ) {
+				// add items to error list and map
+				$.extend( this.errorMap, errors );
+				this.errorList = [];
+				for ( var name in errors ) {
+					this.errorList.push({
+						message: errors[name],
+						element: this.findByName(name)[0]
+					});
+				}
+				// remove items from success list
+				this.successList = $.grep( this.successList, function( element ) {
+					return !(element.name in errors);
+				});
+			}
+			if ( this.settings.showErrors ) {
+				this.settings.showErrors.call( this, this.errorMap, this.errorList );
+			} else {
+				this.defaultShowErrors();
+			}
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Validator/resetForm
+		resetForm: function() {
+			if ( $.fn.resetForm ) {
+				$(this.currentForm).resetForm();
+			}
+			this.submitted = {};
+			this.lastElement = null;
+			this.prepareForm();
+			this.hideErrors();
+			this.elements().removeClass( this.settings.errorClass ).removeData( "previousValue" );
+		},
+
+		numberOfInvalids: function() {
+			return this.objectLength(this.invalid);
+		},
+
+		objectLength: function( obj ) {
+			var count = 0;
+			for ( var i in obj ) {
+				count++;
+			}
+			return count;
+		},
+
+		hideErrors: function() {
+			this.addWrapper( this.toHide ).hide();
+		},
+
+		valid: function() {
+			return this.size() === 0;
+		},
+
+		size: function() {
+			return this.errorList.length;
+		},
+
+		focusInvalid: function() {
+			if ( this.settings.focusInvalid ) {
+				try {
+					$(this.findLastActive() || this.errorList.length && this.errorList[0].element || [])
+					.filter(":visible")
+					.focus()
+					// manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
+					.trigger("focusin");
+				} catch(e) {
+					// ignore IE throwing errors when focusing hidden elements
+				}
+			}
+		},
+
+		findLastActive: function() {
+			var lastActive = this.lastActive;
+			return lastActive && $.grep(this.errorList, function( n ) {
+				return n.element.name === lastActive.name;
+			}).length === 1 && lastActive;
+		},
+
+		elements: function() {
+			var validator = this,
+				rulesCache = {};
+
+			// select all valid inputs inside the form (no submit or reset buttons)
+			return $(this.currentForm)
+			.find("input, select, textarea")
+			.not(":submit, :reset, :image, [disabled]")
+			.not( this.settings.ignore )
+			.filter(function() {
+				if ( !this.name && validator.settings.debug && window.console ) {
+					console.error( "%o has no name assigned", this);
+				}
+
+				// select only the first element for each name, and only those with rules specified
+				if ( this.name in rulesCache || !validator.objectLength($(this).rules()) ) {
+					return false;
+				}
+
+				rulesCache[this.name] = true;
+				return true;
+			});
+		},
+
+		clean: function( selector ) {
+			return $(selector)[0];
+		},
+
+		errors: function() {
+			var errorClass = this.settings.errorClass.replace(" ", ".");
+			return $(this.settings.errorElement + "." + errorClass, this.errorContext);
+		},
+
+		reset: function() {
+			this.successList = [];
+			this.errorList = [];
+			this.errorMap = {};
+			this.toShow = $([]);
+			this.toHide = $([]);
+			this.currentElements = $([]);
+		},
+
+		prepareForm: function() {
+			this.reset();
+			this.toHide = this.errors().add( this.containers );
+		},
+
+		prepareElement: function( element ) {
+			this.reset();
+			this.toHide = this.errorsFor(element);
+		},
+
+		elementValue: function( element ) {
+			var type = $(element).attr("type"),
+				val = $(element).val();
+
+			if ( type === "radio" || type === "checkbox" ) {
+				return $("input[name='" + $(element).attr("name") + "']:checked").val();
+			}
+
+			if ( typeof val === "string" ) {
+				return val.replace(/\r/g, "");
+			}
+			return val;
+		},
+
+		check: function( element ) {
+			element = this.validationTargetFor( this.clean( element ) );
+
+			var rules = $(element).rules();
+			var dependencyMismatch = false;
+			var val = this.elementValue(element);
+			var result;
+
+			for (var method in rules ) {
+				var rule = { method: method, parameters: rules[method] };
+				try {
+
+					result = $.validator.methods[method].call( this, val, element, rule.parameters );
+
+					// if a method indicates that the field is optional and therefore valid,
+					// don't mark it as valid when there are no other rules
+					if ( result === "dependency-mismatch" ) {
+						dependencyMismatch = true;
+						continue;
+					}
+					dependencyMismatch = false;
+
+					if ( result === "pending" ) {
+						this.toHide = this.toHide.not( this.errorsFor(element) );
+						return;
+					}
+
+					if ( !result ) {
+						this.formatAndAdd( element, rule );
+						return false;
+					}
+				} catch(e) {
+					if ( this.settings.debug && window.console ) {
+						console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e );
+					}
+					throw e;
+				}
+			}
+			if ( dependencyMismatch ) {
+				return;
+			}
+			if ( this.objectLength(rules) ) {
+				this.successList.push(element);
+			}
+			return true;
+		},
+
+		// return the custom message for the given element and validation method
+		// specified in the element's HTML5 data attribute
+		customDataMessage: function( element, method ) {
+			return $(element).data("msg-" + method.toLowerCase()) || (element.attributes && $(element).attr("data-msg-" + method.toLowerCase()));
+		},
+
+		// return the custom message for the given element name and validation method
+		customMessage: function( name, method ) {
+			var m = this.settings.messages[name];
+			return m && (m.constructor === String ? m : m[method]);
+		},
+
+		// return the first defined argument, allowing empty strings
+		findDefined: function() {
+			for(var i = 0; i < arguments.length; i++) {
+				if ( arguments[i] !== undefined ) {
+					return arguments[i];
+				}
+			}
+			return undefined;
+		},
+
+		defaultMessage: function( element, method ) {
+			return this.findDefined(
+				this.customMessage( element.name, method ),
+				this.customDataMessage( element, method ),
+				// title is never undefined, so handle empty string as undefined
+				!this.settings.ignoreTitle && element.title || undefined,
+				$.validator.messages[method],
+				"<strong>Warning: No message defined for " + element.name + "</strong>"
+			);
+		},
+
+		formatAndAdd: function( element, rule ) {
+			var message = this.defaultMessage( element, rule.method ),
+				theregex = /\$?\{(\d+)\}/g;
+			if ( typeof message === "function" ) {
+				message = message.call(this, rule.parameters, element);
+			} else if (theregex.test(message)) {
+				message = $.validator.format(message.replace(theregex, "{$1}"), rule.parameters);
+			}
+			this.errorList.push({
+				message: message,
+				element: element
+			});
+
+			this.errorMap[element.name] = message;
+			this.submitted[element.name] = message;
+		},
+
+		addWrapper: function( toToggle ) {
+			if ( this.settings.wrapper ) {
+				toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
+			}
+			return toToggle;
+		},
+
+		defaultShowErrors: function() {
+			var i, elements;
+			for ( i = 0; this.errorList[i]; i++ ) {
+				var error = this.errorList[i];
+				if ( this.settings.highlight ) {
+					this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass );
+				}
+				this.showLabel( error.element, error.message );
+			}
+			if ( this.errorList.length ) {
+				this.toShow = this.toShow.add( this.containers );
+			}
+			if ( this.settings.success ) {
+				for ( i = 0; this.successList[i]; i++ ) {
+					this.showLabel( this.successList[i] );
+				}
+			}
+			if ( this.settings.unhighlight ) {
+				for ( i = 0, elements = this.validElements(); elements[i]; i++ ) {
+					this.settings.unhighlight.call( this, elements[i], this.settings.errorClass, this.settings.validClass );
+				}
+			}
+			this.toHide = this.toHide.not( this.toShow );
+			this.hideErrors();
+			this.addWrapper( this.toShow ).show();
+		},
+
+		validElements: function() {
+			return this.currentElements.not(this.invalidElements());
+		},
+
+		invalidElements: function() {
+			return $(this.errorList).map(function() {
+				return this.element;
+			});
+		},
+
+		showLabel: function( element, message ) {
+			var label = this.errorsFor( element );
+			if ( label.length ) {
+				// refresh error/success class
+				label.removeClass( this.settings.validClass ).addClass( this.settings.errorClass );
+				// replace message on existing label
+				label.html(message);
+			} else {
+				// create label
+				label = $("<" + this.settings.errorElement + ">")
+					.attr("for", this.idOrName(element))
+					.addClass(this.settings.errorClass)
+					.html(message || "");
+				if ( this.settings.wrapper ) {
+					// make sure the element is visible, even in IE
+					// actually showing the wrapped element is handled elsewhere
+					label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent();
+				}
+				if ( !this.labelContainer.append(label).length ) {
+					if ( this.settings.errorPlacement ) {
+						this.settings.errorPlacement(label, $(element) );
+					} else {
+						label.insertAfter(element);
+					}
+				}
+			}
+			if ( !message && this.settings.success ) {
+				label.text("");
+				if ( typeof this.settings.success === "string" ) {
+					label.addClass( this.settings.success );
+				} else {
+					this.settings.success( label, element );
+				}
+			}
+			this.toShow = this.toShow.add(label);
+		},
+
+		errorsFor: function( element ) {
+			var name = this.idOrName(element);
+			return this.errors().filter(function() {
+				return $(this).attr("for") === name;
+			});
+		},
+
+		idOrName: function( element ) {
+			return this.groups[element.name] || (this.checkable(element) ? element.name : element.id || element.name);
+		},
+
+		validationTargetFor: function( element ) {
+			// if radio/checkbox, validate first element in group instead
+			if ( this.checkable(element) ) {
+				element = this.findByName( element.name ).not(this.settings.ignore)[0];
+			}
+			return element;
+		},
+
+		checkable: function( element ) {
+			return (/radio|checkbox/i).test(element.type);
+		},
+
+		findByName: function( name ) {
+			return $(this.currentForm).find("[name='" + name + "']");
+		},
+
+		getLength: function( value, element ) {
+			switch( element.nodeName.toLowerCase() ) {
+			case "select":
+				return $("option:selected", element).length;
+			case "input":
+				if ( this.checkable( element) ) {
+					return this.findByName(element.name).filter(":checked").length;
+				}
+			}
+			return value.length;
+		},
+
+		depend: function( param, element ) {
+			return this.dependTypes[typeof param] ? this.dependTypes[typeof param](param, element) : true;
+		},
+
+		dependTypes: {
+			"boolean": function( param, element ) {
+				return param;
+			},
+			"string": function( param, element ) {
+				return !!$(param, element.form).length;
+			},
+			"function": function( param, element ) {
+				return param(element);
+			}
+		},
+
+		optional: function( element ) {
+			var val = this.elementValue(element);
+			return !$.validator.methods.required.call(this, val, element) && "dependency-mismatch";
+		},
+
+		startRequest: function( element ) {
+			if ( !this.pending[element.name] ) {
+				this.pendingRequest++;
+				this.pending[element.name] = true;
+			}
+		},
+
+		stopRequest: function( element, valid ) {
+			this.pendingRequest--;
+			// sometimes synchronization fails, make sure pendingRequest is never < 0
+			if ( this.pendingRequest < 0 ) {
+				this.pendingRequest = 0;
+			}
+			delete this.pending[element.name];
+			if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
+				$(this.currentForm).submit();
+				this.formSubmitted = false;
+			} else if (!valid && this.pendingRequest === 0 && this.formSubmitted) {
+				$(this.currentForm).triggerHandler("invalid-form", [this]);
+				this.formSubmitted = false;
+			}
+		},
+
+		previousValue: function( element ) {
+			return $.data(element, "previousValue") || $.data(element, "previousValue", {
+				old: null,
+				valid: true,
+				message: this.defaultMessage( element, "remote" )
+			});
+		}
+
+	},
+
+	classRuleSettings: {
+		required: {required: true},
+		email: {email: true},
+		url: {url: true},
+		date: {date: true},
+		dateISO: {dateISO: true},
+		number: {number: true},
+		digits: {digits: true},
+		creditcard: {creditcard: true}
+	},
+
+	addClassRules: function( className, rules ) {
+		if ( className.constructor === String ) {
+			this.classRuleSettings[className] = rules;
+		} else {
+			$.extend(this.classRuleSettings, className);
+		}
+	},
+
+	classRules: function( element ) {
+		var rules = {};
+		var classes = $(element).attr("class");
+		if ( classes ) {
+			$.each(classes.split(" "), function() {
+				if ( this in $.validator.classRuleSettings ) {
+					$.extend(rules, $.validator.classRuleSettings[this]);
+				}
+			});
+		}
+		return rules;
+	},
+
+	attributeRules: function( element ) {
+		var rules = {};
+		var $element = $(element);
+		var type = $element[0].getAttribute("type");
+
+		for (var method in $.validator.methods) {
+			var value;
+
+			// support for <input required> in both html5 and older browsers
+			if ( method === "required" ) {
+				value = $element.get(0).getAttribute(method);
+				// Some browsers return an empty string for the required attribute
+				// and non-HTML5 browsers might have required="" markup
+				if ( value === "" ) {
+					value = true;
+				}
+				// force non-HTML5 browsers to return bool
+				value = !!value;
+			} else {
+				value = $element.attr(method);
+			}
+
+			// convert the value to a number for number inputs, and for text for backwards compability
+			// allows type="date" and others to be compared as strings
+			if ( /min|max/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
+				value = Number(value);
+			}
+
+			if ( value ) {
+				rules[method] = value;
+			} else if ( type === method && type !== 'range' ) {
+				// exception: the jquery validate 'range' method
+				// does not test for the html5 'range' type
+				rules[method] = true;
+			}
+		}
+
+		// maxlength may be returned as -1, 2147483647 (IE) and 524288 (safari) for text inputs
+		if ( rules.maxlength && /-1|2147483647|524288/.test(rules.maxlength) ) {
+			delete rules.maxlength;
+		}
+
+		return rules;
+	},
+
+	dataRules: function( element ) {
+		var method, value,
+			rules = {}, $element = $(element);
+		for (method in $.validator.methods) {
+			value = $element.data("rule-" + method.toLowerCase());
+			if ( value !== undefined ) {
+				rules[method] = value;
+			}
+		}
+		return rules;
+	},
+
+	staticRules: function( element ) {
+		var rules = {};
+		var validator = $.data(element.form, "validator");
+		if ( validator.settings.rules ) {
+			rules = $.validator.normalizeRule(validator.settings.rules[element.name]) || {};
+		}
+		return rules;
+	},
+
+	normalizeRules: function( rules, element ) {
+		// handle dependency check
+		$.each(rules, function( prop, val ) {
+			// ignore rule when param is explicitly false, eg. required:false
+			if ( val === false ) {
+				delete rules[prop];
+				return;
+			}
+			if ( val.param || val.depends ) {
+				var keepRule = true;
+				switch (typeof val.depends) {
+				case "string":
+					keepRule = !!$(val.depends, element.form).length;
+					break;
+				case "function":
+					keepRule = val.depends.call(element, element);
+					break;
+				}
+				if ( keepRule ) {
+					rules[prop] = val.param !== undefined ? val.param : true;
+				} else {
+					delete rules[prop];
+				}
+			}
+		});
+
+		// evaluate parameters
+		$.each(rules, function( rule, parameter ) {
+			rules[rule] = $.isFunction(parameter) ? parameter(element) : parameter;
+		});
+
+		// clean number parameters
+		$.each(['minlength', 'maxlength'], function() {
+			if ( rules[this] ) {
+				rules[this] = Number(rules[this]);
+			}
+		});
+		$.each(['rangelength', 'range'], function() {
+			var parts;
+			if ( rules[this] ) {
+				if ( $.isArray(rules[this]) ) {
+					rules[this] = [Number(rules[this][0]), Number(rules[this][1])];
+				} else if ( typeof rules[this] === "string" ) {
+					parts = rules[this].split(/[\s,]+/);
+					rules[this] = [Number(parts[0]), Number(parts[1])];
+				}
+			}
+		});
+
+		if ( $.validator.autoCreateRanges ) {
+			// auto-create ranges
+			if ( rules.min && rules.max ) {
+				rules.range = [rules.min, rules.max];
+				delete rules.min;
+				delete rules.max;
+			}
+			if ( rules.minlength && rules.maxlength ) {
+				rules.rangelength = [rules.minlength, rules.maxlength];
+				delete rules.minlength;
+				delete rules.maxlength;
+			}
+		}
+
+		return rules;
+	},
+
+	// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
+	normalizeRule: function( data ) {
+		if ( typeof data === "string" ) {
+			var transformed = {};
+			$.each(data.split(/\s/), function() {
+				transformed[this] = true;
+			});
+			data = transformed;
+		}
+		return data;
+	},
+
+	// http://docs.jquery.com/Plugins/Validation/Validator/addMethod
+	addMethod: function( name, method, message ) {
+		$.validator.methods[name] = method;
+		$.validator.messages[name] = message !== undefined ? message : $.validator.messages[name];
+		if ( method.length < 3 ) {
+			$.validator.addClassRules(name, $.validator.normalizeRule(name));
+		}
+	},
+
+	methods: {
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/required
+		required: function( value, element, param ) {
+			// check if dependency is met
+			if ( !this.depend(param, element) ) {
+				return "dependency-mismatch";
+			}
+			if ( element.nodeName.toLowerCase() === "select" ) {
+				// could be an array for select-multiple or a string, both are fine this way
+				var val = $(element).val();
+				return val && val.length > 0;
+			}
+			if ( this.checkable(element) ) {
+				return this.getLength(value, element) > 0;
+			}
+			return $.trim(value).length > 0;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/email
+		email: function( value, element ) {
+			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
+			return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/url
+		url: function( value, element ) {
+			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
+			return this.optional(element) || /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/date
+		date: function( value, element ) {
+			return this.optional(element) || !/Invalid|NaN/.test(new Date(value).toString());
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/dateISO
+		dateISO: function( value, element ) {
+			return this.optional(element) || /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/number
+		number: function( value, element ) {
+			return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/digits
+		digits: function( value, element ) {
+			return this.optional(element) || /^\d+$/.test(value);
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/creditcard
+		// based on http://en.wikipedia.org/wiki/Luhn
+		creditcard: function( value, element ) {
+			if ( this.optional(element) ) {
+				return "dependency-mismatch";
+			}
+			// accept only spaces, digits and dashes
+			if ( /[^0-9 \-]+/.test(value) ) {
+				return false;
+			}
+			var nCheck = 0,
+				nDigit = 0,
+				bEven = false;
+
+			value = value.replace(/\D/g, "");
+
+			for (var n = value.length - 1; n >= 0; n--) {
+				var cDigit = value.charAt(n);
+				nDigit = parseInt(cDigit, 10);
+				if ( bEven ) {
+					if ( (nDigit *= 2) > 9 ) {
+						nDigit -= 9;
+					}
+				}
+				nCheck += nDigit;
+				bEven = !bEven;
+			}
+
+			return (nCheck % 10) === 0;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/minlength
+		minlength: function( value, element, param ) {
+			var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+			return this.optional(element) || length >= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/maxlength
+		maxlength: function( value, element, param ) {
+			var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+			return this.optional(element) || length <= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/rangelength
+		rangelength: function( value, element, param ) {
+			var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+			return this.optional(element) || ( length >= param[0] && length <= param[1] );
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/min
+		min: function( value, element, param ) {
+			return this.optional(element) || value >= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/max
+		max: function( value, element, param ) {
+			return this.optional(element) || value <= param;
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/range
+		range: function( value, element, param ) {
+			return this.optional(element) || ( value >= param[0] && value <= param[1] );
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
+		equalTo: function( value, element, param ) {
+			// bind to the blur event of the target in order to revalidate whenever the target field is updated
+			// TODO find a way to bind the event just once, avoiding the unbind-rebind overhead
+			var target = $(param);
+			if ( this.settings.onfocusout ) {
+				target.unbind(".validate-equalTo").bind("blur.validate-equalTo", function() {
+					$(element).valid();
+				});
+			}
+			return value === target.val();
+		},
+
+		// http://docs.jquery.com/Plugins/Validation/Methods/remote
+		remote: function( value, element, param ) {
+			if ( this.optional(element) ) {
+				return "dependency-mismatch";
+			}
+
+			var previous = this.previousValue(element);
+			if (!this.settings.messages[element.name] ) {
+				this.settings.messages[element.name] = {};
+			}
+			previous.originalMessage = this.settings.messages[element.name].remote;
+			this.settings.messages[element.name].remote = previous.message;
+
+			param = typeof param === "string" && {url:param} || param;
+
+			if ( previous.old === value ) {
+				return previous.valid;
+			}
+
+			previous.old = value;
+			var validator = this;
+			this.startRequest(element);
+			var data = {};
+			data[element.name] = value;
+			$.ajax($.extend(true, {
+				url: param,
+				mode: "abort",
+				port: "validate" + element.name,
+				dataType: "json",
+				data: data,
+				success: function( response ) {
+					validator.settings.messages[element.name].remote = previous.originalMessage;
+					var valid = response === true || response === "true";
+					if ( valid ) {
+						var submitted = validator.formSubmitted;
+						validator.prepareElement(element);
+						validator.formSubmitted = submitted;
+						validator.successList.push(element);
+						delete validator.invalid[element.name];
+						validator.showErrors();
+					} else {
+						var errors = {};
+						var message = response || validator.defaultMessage( element, "remote" );
+						errors[element.name] = previous.message = $.isFunction(message) ? message(value) : message;
+						validator.invalid[element.name] = true;
+						validator.showErrors(errors);
+					}
+					previous.valid = valid;
+					validator.stopRequest(element, valid);
+				}
+			}, param));
+			return "pending";
+		}
+
+	}
+
+});
+
+// deprecated, use $.validator.format instead
+$.format = $.validator.format;
+
+}(jQuery));
+
+// ajax mode: abort
+// usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
+// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
+(function($) {
+	var pendingRequests = {};
+	// Use a prefilter if available (1.5+)
+	if ( $.ajaxPrefilter ) {
+		$.ajaxPrefilter(function( settings, _, xhr ) {
+			var port = settings.port;
+			if ( settings.mode === "abort" ) {
+				if ( pendingRequests[port] ) {
+					pendingRequests[port].abort();
+				}
+				pendingRequests[port] = xhr;
+			}
+		});
+	} else {
+		// Proxy ajax
+		var ajax = $.ajax;
+		$.ajax = function( settings ) {
+			var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode,
+				port = ( "port" in settings ? settings : $.ajaxSettings ).port;
+			if ( mode === "abort" ) {
+				if ( pendingRequests[port] ) {
+					pendingRequests[port].abort();
+				}
+				pendingRequests[port] = ajax.apply(this, arguments);
+				return pendingRequests[port];
+			}
+			return ajax.apply(this, arguments);
+		};
+	}
+}(jQuery));
+
+// provides delegate(type: String, delegate: Selector, handler: Callback) plugin for easier event delegation
+// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
+(function($) {
+	$.extend($.fn, {
+		validateDelegate: function( delegate, type, handler ) {
+			return this.bind(type, function( event ) {
+				var target = $(event.target);
+				if ( target.is(delegate) ) {
+					return handler.apply(target, arguments);
+				}
+			});
+		}
+	});
+}(jQuery));
diff --git a/framework/core/forms/controls/bootstrap/formcontrol.php b/framework/core/forms/controls/bootstrap/formcontrol.php
index 19a50f42d7..5c8fe5d09e 100644
--- a/framework/core/forms/controls/bootstrap/formcontrol.php
+++ b/framework/core/forms/controls/bootstrap/formcontrol.php
@@ -72,7 +72,8 @@ function toHTML($label,$name) {
 		    $divID  = ' id="'.$this->id.'Control"';
 		    $for = ' for="'.$this->id.'"';
 		} else {
-		    $divID  = '';
+//		    $divID  = '';
+            $divID  = ' id="'.$name.'Control"';
 		    $for = '';
 		}
 		
diff --git a/framework/core/forms/controls/bootstrap/genericcontrol.php b/framework/core/forms/controls/bootstrap/genericcontrol.php
index 8be5528cfe..25e257a47a 100644
--- a/framework/core/forms/controls/bootstrap/genericcontrol.php
+++ b/framework/core/forms/controls/bootstrap/genericcontrol.php
@@ -60,7 +60,8 @@ function toHTML($label,$name) {
             $divID  = ' id="'.$this->id.'Control"';
             $for = ' for="'.$this->id.'"';
         } else {
-            $divID  = '';
+//            $divID  = '';
+            $divID  = ' id="'.$name.'Control"';
             $for = '';
         }
 //        if ($this->required) $label = "*" . $label;
diff --git a/framework/core/forms/controls/colorcontrol.php b/framework/core/forms/controls/colorcontrol.php
index b6ffefe84e..f45134bdff 100644
--- a/framework/core/forms/controls/colorcontrol.php
+++ b/framework/core/forms/controls/colorcontrol.php
@@ -67,7 +67,8 @@ function toHTML($label, $name) {
             $divID = ' id="' . $this->id . 'Control"';
             $for   = ' for="' . $this->id . '"';
         } else {
-            $divID = '';
+//            $divID = '';
+            $divID = ' id="' . $name . 'Control"';
             $for   = '';
         }
 
diff --git a/framework/core/forms/controls/formcontrol.php b/framework/core/forms/controls/formcontrol.php
index c0ce16ef3e..ac7dfe539a 100644
--- a/framework/core/forms/controls/formcontrol.php
+++ b/framework/core/forms/controls/formcontrol.php
@@ -72,7 +72,8 @@ function toHTML($label,$name) {
 		    $divID  = ' id="'.$this->id.'Control"';
 		    $for = ' for="'.$this->id.'"';
 		} else {
-		    $divID  = '';
+//		    $divID  = '';
+            $divID  = ' id="'.$name.'Control"';
 		    $for = '';
 		}
 		
diff --git a/framework/core/forms/controls/genericcontrol.php b/framework/core/forms/controls/genericcontrol.php
index d6874c14ea..eeb6f5252e 100644
--- a/framework/core/forms/controls/genericcontrol.php
+++ b/framework/core/forms/controls/genericcontrol.php
@@ -60,7 +60,8 @@ function toHTML($label,$name) {
             $divID  = ' id="'.$this->id.'Control"';
             $for = ' for="'.$this->id.'"';
         } else {
-            $divID  = '';
+//            $divID  = '';
+            $divID  = ' id="'.$name.'Control"';
             $for = '';
         }
 //        if ($this->required) $label = "*" . $label;
@@ -92,7 +93,7 @@ function toHTML($label,$name) {
     function controlToHTML($name, $label) {
         $this->size = !empty($this->size) ? $this->size : 20;
         $this->name = empty($this->name) ? $name : $this->name;
-        $inputID  = (!empty($this->id)) ? ' id="'.$this->id.'"' : "";
+        $inputID  = (!empty($this->id)) ? ' id="'.$this->id.'"' : ' id="'.$this->name.'"';
         $html = '';
         $framework = expSession::get('framework');
         if ($framework == 'bootstrap') {
@@ -127,7 +128,7 @@ function controlToHTML($name, $label) {
         if (!empty($this->readonly)) $html .= ' readonly="readonly"';
 
         $caption = !empty($this->caption) ? $this->caption : '';
-        if (!empty($this->required)) $html .= ' required="'.rawurlencode($this->default).'" caption="'.$caption.'"';
+        if (!empty($this->required)) $html .= ' required="required" caption="'.$caption.'"';
         if (!empty($this->onclick)) $html .= ' onclick="'.$this->onclick.'"';
         if (!empty($this->onchange)) $html .= ' onchange="'.$this->onchange.'"';
 
diff --git a/framework/core/forms/controls/pagecontrol.php b/framework/core/forms/controls/pagecontrol.php
new file mode 100644
index 0000000000..ee1da8656a
--- /dev/null
+++ b/framework/core/forms/controls/pagecontrol.php
@@ -0,0 +1,126 @@
+<?php
+
+##################################################
+#
+# Copyright (c) 2004-2013 OIC Group, Inc.
+#
+# This file is part of Exponent
+#
+# Exponent is free software; you can redistribute
+# it and/or modify it under the terms of the GNU
+# General Public License as published by the Free
+# Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# GPL: http://www.gnu.org/licenses/gpl.txt
+#
+##################################################
+/** @define "BASE" "../../../../.." */
+
+if (!defined('EXPONENT')) exit('');
+
+/**
+ * Page Control - Form Wizard Page marker
+ *
+ * @package Subsystems-Forms
+ * @subpackage Control
+ */
+class pagecontrol extends formcontrol {
+
+    var $caption = "";
+//    var $placeholder = "";
+//    var $pattern = "";
+//    var $size = 40;
+//    var $maxlength = "";
+
+    static function name() { return "Form Page Break - Wizard"; }
+    static function isSimpleControl() { return true; }
+    static function useGeneric() { return false; }
+    static function getFieldDefinition() {
+        return null;
+    }
+
+    function __construct($default = "", $size=40 , $disabled = false, $maxlength = 0, $filter = "", $required = false, $placeholder = "", $pattern="") {
+//        $this->disabled = $disabled;
+//        $this->default = $default;
+//        $this->placeholder = $placeholder;
+//        $this->pattern = $pattern;
+//        $this->size = $size;
+//        $this->maxlength = $maxlength;
+//        $this->filter = $filter;
+//        $this->required = $required;
+    }
+
+    /**
+     * Place the control in the form
+     *
+     * @param $label
+     * @param $name
+     * @return string
+     */
+    function toHTML($label,$name) {
+        $caption = !empty($this->caption) ? $this->caption : str_replace(array(":","*"), "", ucwords($label));
+        $description = !empty($this->description) ? $this->description : $caption;
+        $html  = '<fieldset title="'.$caption.'"><legend>'.$description.'</legend>';
+        return $html;
+	}
+
+    function controlToHTML($name, $label) {
+        $html = "<label class=\"label\">".gt('Page Break').' - '.$label."</label>";
+        $html .= $this->toHTML($name, $label);
+        return $html . '</fieldset>';
+    }
+
+    static function form($object) {
+        $form = new form();
+        if (empty($object)) $object = new stdClass();
+        if (!isset($object->identifier)) {
+            $object->identifier = "";
+            $object->caption = "";
+            $object->description = "";
+//            $object->default = "";
+//            $object->placeholder = "";
+//            $object->pattern = "";
+//            $object->size = 0;
+//            $object->maxlength = 0;
+//            $object->required = false;
+        }
+        if (empty($object->description)) $object->description = "";
+        $form->register("identifier",gt('Identifier'),new textcontrol($object->identifier));
+        $form->register("caption",gt('Caption'), new textcontrol($object->caption));
+        $form->register("description",gt('Control Description'), new textcontrol($object->description));
+//        $form->register("default",gt('Default'), new textcontrol($object->default));
+//        $form->register("placeholder",gt('Placeholder'), new textcontrol($object->placeholder));
+//        $form->register("pattern",gt('Pattern'), new textcontrol($object->pattern));
+//        $form->register("size",gt('Size'), new textcontrol((($object->size==0)?"":$object->size),4,false,3,"integer"));
+//        $form->register("maxlength",gt('Maximum Length'), new textcontrol((($object->maxlength==0)?"":$object->maxlength),4,false,3,"integer"));
+//        $form->register("required", gt('Make this a required field.'), new checkboxcontrol($object->required,false));
+        $form->register("submit","",new buttongroupcontrol(gt('Save'),'',gt('Cancel'),"",'editable'));
+        return $form;
+    }
+
+    static function update($values, $object) {
+        $this_control = $values['control_type'];
+//        if ($object == null) $object = new textcontrol();
+        if ($object == null) $object = new $this_control();
+        if ($values['identifier'] == "") {
+            $post = $_POST;
+            $post['_formError'] = gt('Identifier is required.');
+            expSession::set("last_POST",$post);
+            return null;
+        }
+        $object->identifier = $values['identifier'];
+        $object->caption = $values['caption'];
+        $object->description = $values['description'];
+//        if (isset($values['default'])) $object->default = $values['default'];
+//        if (isset($values['placeholder'])) $object->placeholder = $values['placeholder'];
+//        if (isset($values['pattern'])) $object->pattern = $values['pattern'];
+//        if (isset($values['size'])) $object->size = intval($values['size']);
+//        if (isset($values['maxlength'])) $object->maxlength = intval($values['maxlength']);
+//        $object->required = isset($values['required']);
+        return $object;
+    }
+
+}
+
+?>
diff --git a/framework/core/forms/controls/radiocontrol.php b/framework/core/forms/controls/radiocontrol.php
index 555c17d7a8..3602ea5cfc 100644
--- a/framework/core/forms/controls/radiocontrol.php
+++ b/framework/core/forms/controls/radiocontrol.php
@@ -47,7 +47,8 @@ function toHTML($label,$name) {
 		    $divID  = ' id="'.$this->id.'Control"';
 		    $for = ' for="'.$this->id.'"';
 		} else {
-		    $divID  = '';
+//		    $divID  = '';
+            $divID  = ' id="'.$name.'Control"';
 //		    $for = ' for="'.$name.'"';
             $for = ' for="'.$name.$this->value.'"';
 		}
diff --git a/framework/core/forms/controls/rangecontrol.php b/framework/core/forms/controls/rangecontrol.php
index cfb72ac887..ab297daf3c 100644
--- a/framework/core/forms/controls/rangecontrol.php
+++ b/framework/core/forms/controls/rangecontrol.php
@@ -36,7 +36,7 @@ static function name() { return "Text Box - Range"; }
 
     function controlToHTML($name, $label) {
         $this->size = !empty($this->size) ? $this->size : 25;
-        $inputID  = (!empty($this->id)) ? ' id="'.$this->id.'"' : "";
+        $inputID  = (!empty($this->id)) ? ' id="'.$this->id.'"' : ' id="'.$name.'"';
         if ($this->type != 'text') {
             $extra_class = ' ' . $this->type;
         } else {
diff --git a/framework/core/forms/controls/textcontrol.php b/framework/core/forms/controls/textcontrol.php
index 5a9ff36277..75d1e90bad 100644
--- a/framework/core/forms/controls/textcontrol.php
+++ b/framework/core/forms/controls/textcontrol.php
@@ -55,7 +55,7 @@ function __construct($default = "", $size=40 , $disabled = false, $maxlength = 0
 
     function controlToHTML($name, $label) {
         $this->size = !empty($this->size) ? $this->size : 25;
-        $inputID  = (!empty($this->id)) ? ' id="'.$this->id.'"' : "";
+        $inputID  = (!empty($this->id)) ? ' id="'.$this->id.'"' : ' id="'.$name.'"';
         if ($this->type != 'text') {
             $extra_class = ' ' . $this->type;
         } else {
@@ -78,7 +78,7 @@ function controlToHTML($name, $label) {
         }
 
         $caption = !empty($this->caption) ? $this->caption : str_replace(array(":","*"), "", ucwords($label));
-        if (!empty($this->required)) $html .= ' required="'.rawurlencode($this->default).'" caption="'.$caption.'"';
+        if (!empty($this->required)) $html .= ' required="required" caption="'.$caption.'"';
         $html .= "/>";
         if (!empty($this->description)) $html .= "<div class=\"control-desc\">".$this->description."</div>";
         return $html;
diff --git a/framework/core/forms/controls/yuidatetimecontrol.php b/framework/core/forms/controls/yuidatetimecontrol.php
index b710f551bc..3d51eb8e05 100644
--- a/framework/core/forms/controls/yuidatetimecontrol.php
+++ b/framework/core/forms/controls/yuidatetimecontrol.php
@@ -59,7 +59,8 @@ function toHTML($label, $name) {
             $divID = ' id="' . $this->id . 'Control"';
             $for   = ' for="' . $this->id . '"';
         } else {
-            $divID = '';
+//            $divID = '';
+            $divID = ' id="' . $name . 'Control"';
             $for   = '';
         }
 
diff --git a/framework/core/forms/fakeform.php b/framework/core/forms/fakeform.php
index e393586c53..8cd45e2983 100644
--- a/framework/core/forms/fakeform.php
+++ b/framework/core/forms/fakeform.php
@@ -132,7 +132,7 @@ function toHTML($forms_id=null, $module=null) {
                 if (!empty($this->controls[$name]->description)) $html .= "<br><div class=\"control-desc\" style=\"position:absolute;\">" . $this->controls[$name]->description . "</div>";
             }
 
-            if ((empty($this->controls[$name]->flip) && $this->controls[$name]->_controltype == 'checkboxcontrol')) {
+            if ((empty($this->controls[$name]->flip) && $this->controls[$name]->_controltype == 'checkboxcontrol') || $this->controls[$name]->_controltype == 'pagecontrol') {
             } elseif (!empty($this->controlLbl[$name])) {
                 if ($this->controls[$name]->_controltype == 'checkboxcontrol') {
                     $html .= "<label ".$for." class=\"label\" style=\"display:inline;\">";
@@ -173,7 +173,6 @@ function toHTML($forms_id=null, $module=null) {
 			$html .= "</div>";
 			
 			$rank++;
-			
 		}
 	//	$html .= "<tr><td width='5%'></td><td wdith='90%'><td></td width='5%'></tr>\r\n";
 	//	$html .= "</table>\r\n";
diff --git a/framework/core/forms/form.php b/framework/core/forms/form.php
index 7ad524aace..31754d2f3c 100644
--- a/framework/core/forms/form.php
+++ b/framework/core/forms/form.php
@@ -31,8 +31,9 @@ class form extends baseform {
 	var $controls   = array();
 	var $controlIdx = array();
 	var $controlLbl = array();
-    var $tabs       = array();
-    var $is_tabbed  = false;
+    var $id = null;
+//    var $tabs       = array();
+//    var $is_tabbed  = false;
 
 	var $validationScript = "";
 
@@ -202,13 +203,13 @@ function toHTML($form_id=null, $module=null) {
 			//expSession::un_set("last_POST");
 		}
         $num_tabs = array();
-		if ($this->is_tabbed) {
-            foreach ($this->tabs as $tab) {
-                if (!in_array($tab,$num_tabs) && $tab != 'base') {
-                    $num_tabs[]=$tab;
-                }
-            }
-        }
+//		if ($this->is_tabbed) {
+//            foreach ($this->tabs as $tab) {
+//                if (!in_array($tab,$num_tabs) && $tab != 'base') {
+//                    $num_tabs[]=$tab;
+//                }
+//            }
+//        }
 		$html = "<!-- Form Object '" . $this->name . "' -->\r\n";
 //		$html .= '<script type="text/javascript" src="'.PATH_RELATIVE.'framework/core/forms/js/required.js"></script>'."\r\n";
 		$html .= "<script type=\"text/javascript\" src=\"" .PATH_RELATIVE."framework/core/forms/js/inputfilters.js.php\"></script>\r\n";
@@ -248,29 +249,33 @@ function toHTML($form_id=null, $module=null) {
 			$html .= " onsubmit=\"new Ajax.Updater('".$this->div_to_update."', '".$this->action."', ";
 			$html .= "{asynchronous:true, parameters:Form.serialize(this)}); return false;\">\r\n";
 		} else {
-			$html .= "<form name=\"" . $this->name . "\" method=\"" . $this->method . "\" action=\"" . $this->action . "\" enctype=\"".$this->enctype."\">\r\n";
+			$html .= "<form id='".$this->id."' name=\"" . $this->name . "\" method=\"" . $this->method . "\" action=\"" . $this->action . "\" enctype=\"".$this->enctype."\">\r\n";
 		}
 		//$html .= "<form name=\"" . $this->name . "\" method=\"" . $this->method . "\" action=\"" . $this->action . "\" enctype=\"".$this->enctype."\">\r\n";
 		foreach ($this->meta as $name=>$value) $html .= "<input type=\"hidden\" name=\"$name\" id=\"$name\" value=\"$value\" />\r\n";
-		$html .= "<div class=\"form_wrapper\">\r\n";
-        if ($this->is_tabbed) {
-            $html .= '<div id="configure-tabs" class="yui-navset exp-skin-tabview hide">'."\r\n";
-            $html .= '<ul class="yui-nav">'."\r\n";
-            foreach ($num_tabs as $key=>$tab_name) {
-                if (!empty($tab_name)) $html .= '<li'.($key==0?' class="selected"':'').'><a href="#tab'.($key+1).'"><em>'.gt($tab_name).'</em></a></li>'."\r\n";
-            }
-            $html .= '</ul>'."\r\n";
-            $html .= '<div class="yui-content">'."\r\n";
-        }
+//		$html .= "<div class=\"form_wrapper\">\r\n";
+//        if ($this->is_tabbed) {
+//            $html .= '<div id="configure-tabs" class="yui-navset exp-skin-tabview hide">'."\r\n";
+//            $html .= '<ul class="yui-nav">'."\r\n";
+//            foreach ($num_tabs as $key=>$tab_name) {
+//                if (!empty($tab_name)) $html .= '<li'.($key==0?' class="selected"':'').'><a href="#tab'.($key+1).'"><em>'.gt($tab_name).'</em></a></li>'."\r\n";
+//            }
+//            $html .= '</ul>'."\r\n";
+//            $html .= '<div class="yui-content">'."\r\n";
+//        }
 
         $oldname = 'oldname';
         $save = '';
+        $rank = 0;
 		foreach ($this->controlIdx as $name) {
-            if ($this->is_tabbed && !empty($this->tabs[$name]) && $this->tabs[$name] != $oldname && $this->tabs[$name] != 'base') {
-                if ($oldname != 'oldname') {
-                    $html .= '</div>'."\r\n";
-                }
-                $html .= '<div id="tab'.(array_search($this->tabs[$name],$num_tabs)+1).'">'."\r\n";
+//            if ($this->is_tabbed && !empty($this->tabs[$name]) && $this->tabs[$name] != $oldname && $this->tabs[$name] != 'base') {
+//                if ($oldname != 'oldname') {
+//                    $html .= '</div>'."\r\n";
+//                }
+//                $html .= '<div id="tab'.(array_search($this->tabs[$name],$num_tabs)+1).'">'."\r\n";
+//            }
+            if (get_class($this->controls[$name]) == 'pagecontrol' && $rank) {
+                $html .= '</fieldset>';
             }
             if ($this->tabs[$name] != 'base') {
     			$html .= $this->controls[$name]->toHTML($this->controlLbl[$name],$name) . "\r\n";
@@ -278,12 +283,16 @@ function toHTML($form_id=null, $module=null) {
             } else {
                 $save .= $this->controls[$name]->toHTML($this->controlLbl[$name],$name) . "\r\n";
             }
+            $rank ++;
 		}
 
-        if ($this->is_tabbed) {
-            $html .= '</div></div></div>';
-        }
-		$html .= "</div>\r\n";
+//        if ($this->is_tabbed) {
+//            $html .= '</div></div></div>';
+//        }
+//        if (get_class($this->controls[$name]) == 'pagecontrol' && $rank || $rank == (count($this->controlIdx) - 1)) {
+            $html .= '</fieldset>';
+//        }
+//		$html .= "</div>\r\n";
         $html .= $save;
 		$html .= "</form>\r\n";
 		return $html;
diff --git a/framework/modules/forms/controllers/formsController.php b/framework/modules/forms/controllers/formsController.php
index f245548145..434be3095e 100644
--- a/framework/modules/forms/controllers/formsController.php
+++ b/framework/modules/forms/controllers/formsController.php
@@ -250,6 +250,7 @@ public function enterdata() {
 
             if (!empty($f)) {
                 $form = new form();
+                $form->id = $f->sef_url;
                 if (!empty($this->params['id'])) {
                     $fc = new forms_control();
                     $controls = $fc->find('all', 'forms_id=' . $f->id . ' AND is_readonly=0 AND is_static = 0','rank');
@@ -297,6 +298,7 @@ public function enterdata() {
                     $emaillist = array_reverse($emaillist, true);
                     $form->register('email_dest', gt('Send Response to'), new radiogroupcontrol('', $emaillist));
                 }
+                $paged = false;
                 foreach ($controls as $c) {
 //                    $ctl = unserialize($c->data);
                     $ctl = expUnserialize($c->data);
@@ -313,6 +315,7 @@ public function enterdata() {
                         if (!empty($data[$c->name])) $ctl->default = $data[$c->name];
                     }
                     $form->register($c->name, $c->caption, $ctl);
+                    if (get_class($ctl) == 'pagecontrol') $paged = true;
                 }
 
                 // if we are editing an existing record we'll need to do recaptcha here since we won't call confirm_data
@@ -351,7 +354,7 @@ public function enterdata() {
                 }
                 if (empty($this->config['submitbtn'])) $this->config['submitbtn'] = gt('Submit');
                 if (empty($this->config['resetbtn'])) $this->config['resetbtn'] = '';
-                $form->register("submit", "", new buttongroupcontrol($this->config['submitbtn'], $this->config['resetbtn'], $cancel));
+                $form->register("submit", "", new buttongroupcontrol($this->config['submitbtn'], $this->config['resetbtn'], $cancel, 'finish stepy-finish'));
 
                 $form->meta("m", $this->loc->mod);
                 $form->meta("s", $this->loc->src);
@@ -376,6 +379,7 @@ public function enterdata() {
                     "form_html"   => $form->toHTML($f->id),
                     "form"        => $f,
                     "count"       => $count,
+                    'paged'       => $paged,
                 ));
             }
         } else {
@@ -891,8 +895,12 @@ public function edit_control() {
                 $form->meta('forms_id', $f->id);
                 $types = expTemplate::listControlTypes();
                 $othertypes = expTemplate::listSimilarControlTypes($control_type);
-                $otherlist = new dropdowncontrol($control_type,$othertypes);
-                $form->registerBefore('identifier','control_type',gt('Control Type'),$otherlist);
+                if (count($othertypes) > 1) {
+                    $otherlist = new dropdowncontrol($control_type,$othertypes);
+                    $form->registerBefore('identifier','control_type',gt('Control Type'),$otherlist);
+                } else {
+                    $form->registerBefore('identifier','control_type',gt('Control Type'),new genericcontrol('hidden',$control_type));
+                }
                 assign_to_template(array(
                     'form_html' => $form->toHTML($f->id),
                     'type'      => $types[$control_type],
diff --git a/framework/modules/forms/definitions/forms_control.php b/framework/modules/forms/definitions/forms_control.php
index e282f28885..80ac0c58fd 100644
--- a/framework/modules/forms/definitions/forms_control.php
+++ b/framework/modules/forms/definitions/forms_control.php
@@ -43,8 +43,6 @@
         DB_FIELD_TYPE => DB_DEF_BOOLEAN),
     'rank'        => array(
         DB_FIELD_TYPE => DB_DEF_INTEGER),
-    'page'=>array(
-   		DB_FIELD_TYPE=>DB_DEF_INTEGER),
 );
 
 ?>
\ No newline at end of file
diff --git a/framework/modules/forms/views/forms/edit_control.tpl b/framework/modules/forms/views/forms/edit_control.tpl
index 3f76e50e32..0fad32a518 100644
--- a/framework/modules/forms/views/forms/edit_control.tpl
+++ b/framework/modules/forms/views/forms/edit_control.tpl
@@ -18,7 +18,8 @@
         <h1>{if $is_edit == 1}{'Edit Control'|gettext}{else}{'Create a New Control'|gettext}{/if} - {$type}</h1>
     </div>
     {$form_html}
-    {if $is_edit != 1 && $type != "htmlcontrol"}{br}<em>
-    <strong>** {'Adding this control will reset the default report to all fields'|gettext} **</strong></em>{/if}
+    {if $is_edit != 1 && $type != "htmlcontrol" && $type != "pagecontrol"}{br}<em>
+        <strong>** {'Adding this control will reset the default report to all fields'|gettext} **</strong></em>
+    {/if}
 </div>
 
diff --git a/framework/modules/forms/views/forms/enterdata.tpl b/framework/modules/forms/views/forms/enterdata.tpl
index af3811592c..c86209574f 100644
--- a/framework/modules/forms/views/forms/enterdata.tpl
+++ b/framework/modules/forms/views/forms/enterdata.tpl
@@ -13,6 +13,7 @@
  *
  *}
 
+{uniqueid prepend=$form->sef_url assign="name"}
 {if !$error}
     {if $config.style}
         {css unique="formmod2" corecss="forms2col"}
@@ -66,3 +67,30 @@
         </div>
     </div>
 {/if}
+
+{*{script unique=jWizard jquery='jqueryui,jquery.jWizard'}*}
+    {*$("#test").jWizard();*}
+{*{/script}*}
+
+{*{script unique=quickWizard jquery='jqueryui,jquery.validate,jquery.quickWizard'}*}
+    {*$(document).ready(function() {*}
+        {*$('#test').quickWizard();*}
+    {*});*}
+{*{/script}*}
+
+{if $paged}
+{script unique=$name jquery='jquery.validate,jquery.stepy'}
+{literal}
+    $("#{/literal}{$form->sef_url}{literal}").stepy({
+        validate: true,
+        block: true,
+        errorImage: true,
+        description: false,
+//        finishButton: false,  // otherwise crashes because we can't find submit button
+        btnClass: 'awesome {/literal}{$smarty.const.BTN_SIZE} {$smarty.const.BTN_COLOR}{literal}',
+        legend: false,
+        titleClick: true,
+    });
+{/literal}
+{/script}
+{/if}