Merge branch 'develop'

config.json

@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.4.4", 
+ "framework_version": "3.5.0", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

public/js/wn/form/control.js

@@ -446,7 +446,8 @@ wn.ui.form.ControlCheck = wn.ui.form.ControlData.extend({
 		this.$wrapper = $('<div class="form-group row" style="margin: 0px;">\
 		<div class="col-md-offset-4 col-md-8">\
 			<div class="checkbox" style="margin: 5px 0px">\
-				<label class="input-area">\
+				<label>\
+					<span class="input-area"></span>\
 					<span class="disp-area" style="display:none;"></span>\
 					<span class="label-area small text-muted"></span>\
 				</label>\