Merge remote-tracking branch 'origin/master'

# Conflicts:
#	data/ddl/role.sql
#	data/ddl/user.sql
#	data/rest/role.yaml
#	data/rest/user.yaml
#	lib/src/persistence/persistence.dart
#	lib/src/persistence/rest_persistence.dart
#	lib/src/widget/filters.dart
#	lib/src/widget/module_controller.dart
#	lib/src/widget/text_form_field_bone.dart
#	test/rest_persistence_test.dart

diff --cc data/ddl/role.sql
index cba827e6dbae50b68da908f63c7a0c803d07a396,73b38db8fbd131c3ed559ff3821c55a36d2e4d43..a061d4163052f45fb669198eafaa3119074a86d0
--- 1/data/ddl/role.sql
--- 2/data/ddl/role.sql
+++ b/data/ddl/role.sql
@@@ -1,12 -1,12 +1,26 @@@
++<<<<<<< HEAD
 +DROP TABLE IF EXISTS role;
 +CREATE TABLE role (
 +  role_id INT(10) UNSIGNED NOT NULL UNIQUE AUTO_INCREMENT,
 +  role_name VARCHAR(32) UNIQUE NOT NULL,
 +  role_priority INT(10),
 +  role_active CHAR(1),
 +  role_createdat TIMESTAMP NULL,
 +  role_createdby VARCHAR(16),
 +  role_changedat TIMESTAMP NULL,
 +  role_changedby VARCHAR(16),
 +  PRIMARY KEY(role_id)
++=======
+ drop table if exists role;
+ create table role (
+   role_id int(10) notnull unique,
+   role_name varchar(32) unique notnull,
+   role_priority int(10),
+   role_active char(1),
+   role_createdat timestamp null,
+   role_createdby varchar(16),
+   role_changedat timestamp null,
+   role_changedby varchar(16),
+   primary role_id
++>>>>>>> origin/master
  );

diff --cc data/ddl/user.sql
index 84441b664798c1886e35598040196416377825a1,1b4d6b76c781bb2f676b820c921c34b4e0f3fb0e..2d239569b43eb6140794b2b683fd2ea3a90178da
--- 1/data/ddl/user.sql
--- 2/data/ddl/user.sql
+++ b/data/ddl/user.sql
@@@ -1,14 -1,14 +1,30 @@@
++<<<<<<< HEAD
 +DROP TABLE IF EXISTS user;
 +CREATE TABLE user (
 +  user_id INT(10) UNSIGNED NOT NULL UNIQUE AUTO_INCREMENT,
 +  user_name VARCHAR(64) UNIQUE NOT NULL,
 +  user_displayname VARCHAR(32) UNIQUE,
 +  user_email VARCHAR(128) UNIQUE,
 +  user_password VARCHAR(128),
 +  user_role INT(10) UNSIGNED,
 +  user_createdat TIMESTAMP NULL,
 +  user_createdby VARCHAR(16),
 +  user_changedat TIMESTAMP NULL,
 +  user_changedby VARCHAR(16),
 +  PRIMARY KEY(user_id)
++=======
+ drop table if exists user;
+ create table user (
+   user_id int(10) notnull unique,
+   user_name varchar(64) unique notnull,
+   user_displayname varchar(32) unique,
+   user_email varchar(128) unique,
+   user_password varchar(128),
+   user_role int(10),
+   user_createdat timestamp null,
+   user_createdby varchar(16),
+   user_changedat timestamp null,
+   user_changedby varchar(16),
+   primary user_id
++>>>>>>> origin/master
  );