Third party plugins now included as part of STDM package
Third party plugins now included as part of STDM package
Merge branch 'custom_forms' of https://github.com/gltn/stdm-plugin into custom_forms

Conflicts:
	third_party/__init__.py
	third_party/sqlalchemy/__init__.py
	third_party/sqlalchemy/connectors/__init__.py
	third_party/sqlalchemy/connectors/mxodbc.py
	third_party/sqlalchemy/connectors/mysqldb.py
	third_party/sqlalchemy/connectors/pyodbc.py
	third_party/sqlalchemy/connectors/zxJDBC.py
	third_party/sqlalchemy/databases/__init__.py
	third_party/sqlalchemy/dialects/__init__.py
	third_party/sqlalchemy/dialects/drizzle/base.py
	third_party/sqlalchemy/dialects/firebird/__init__.py
	third_party/sqlalchemy/dialects/firebird/base.py
	third_party/sqlalchemy/dialects/firebird/fdb.py
	third_party/sqlalchemy/dialects/firebird/kinterbasdb.py
	third_party/sqlalchemy/dialects/mssql/__init__.py
	third_party/sqlalchemy/dialects/mssql/adodbapi.py
	third_party/sqlalchemy/dialects/mssql/base.py
	third_party/sqlalchemy/dialects/mssql/information_schema.py
	third_party/sqlalchemy/dialects/mssql/mxodbc.py
	third_party/sqlalchemy/dialects/mssql/pymssql.py
	third_party/sqlalchemy/dialects/mssql/pyodbc.py
	third_party/sqlalchemy/dialects/mssql/zxjdbc.py
	third_party/sqlalchemy/dialects/mysql/__init__.py
	third_party/sqlalchemy/dialects/mysql/base.py
	third_party/sqlalchemy/dialects/mysql/cymysql.py
	third_party/sqlalchemy/dialects/mysql/gaerdbms.py
	third_party/sqlalchemy/dialects/mysql/mysqlconnector.py
	third_party/sqlalchemy/dialects/mysql/mysqldb.py
	third_party/sqlalchemy/dialects/mysql/oursql.py
	third_party/sqlalchemy/dialects/mysql/pymysql.py
	third_party/sqlalchemy/dialects/mysql/pyodbc.py
	third_party/sqlalchemy/dialects/mysql/zxjdbc.py
	third_party/sqlalchemy/dialects/oracle/__init__.py
	third_party/sqlalchemy/dialects/oracle/base.py
	third_party/sqlalchemy/dialects/oracle/cx_oracle.py
	third_party/sqlalchemy/dialects/oracle/zxjdbc.py
	third_party/sqlalchemy/dialects/postgres.py
	third_party/sqlalchemy/dialects/postgresql/__init__.py
	third_party/sqlalchemy/dialects/postgresql/base.py
	third_party/sqlalchemy/dialects/postgresql/constraints.py
	third_party/sqlalchemy/dialects/postgresql/hstore.py
	third_party/sqlalchemy/dialects/postgresql/json.py
	third_party/sqlalchemy/dialects/postgresql/pg8000.py
	third_party/sqlalchemy/dialects/postgresql/psycopg2.py
	third_party/sqlalchemy/dialects/postgresql/pypostgresql.py
	third_party/sqlalchemy/dialects/postgresql/ranges.py
	third_party/sqlalchemy/dialects/postgresql/zxjdbc.py
	third_party/sqlalchemy/dialects/sqlite/__init__.py
	third_party/sqlalchemy/dialects/sqlite/base.py
	third_party/sqlalchemy/dialects/sqlite/pysqlite.py
	third_party/sqlalchemy/dialects/sybase/__init__.py
	third_party/sqlalchemy/dialects/sybase/base.py
	third_party/sqlalchemy/dialects/sybase/mxodbc.py
	third_party/sqlalchemy/dialects/sybase/pyodbc.py
	third_party/sqlalchemy/dialects/sybase/pysybase.py
	third_party/sqlalchemy/engine/__init__.py
	third_party/sqlalchemy/engine/base.py
	third_party/sqlalchemy/engine/default.py
	third_party/sqlalchemy/engine/interfaces.py
	third_party/sqlalchemy/engine/reflection.py
	third_party/sqlalchemy/engine/result.py
	third_party/sqlalchemy/engine/strategies.py
	third_party/sqlalchemy/engine/threadlocal.py
	third_party/sqlalchemy/engine/url.py
	third_party/sqlalchemy/engine/util.py
	third_party/sqlalchemy/event/__init__.py
	third_party/sqlalchemy/event/api.py
	third_party/sqlalchemy/event/attr.py
	third_party/sqlalchemy/event/base.py
	third_party/sqlalchemy/event/legacy.py
	third_party/sqlalchemy/event/registry.py
	third_party/sqlalchemy/events.py
	third_party/sqlalchemy/exc.py
	third_party/sqlalchemy/ext/__init__.py
	third_party/sqlalchemy/ext/associationproxy.py
	third_party/sqlalchemy/ext/automap.py
	third_party/sqlalchemy/ext/compiler.py
	third_party/sqlalchemy/ext/declarative/__init__.py
	third_party/sqlalchemy/ext/declarative/api.py
	third_party/sqlalchemy/ext/declarative/base.py
	third_party/sqlalchemy/ext/declarative/clsregistry.py
	third_party/sqlalchemy/ext/horizontal_shard.py
	third_party/sqlalchemy/ext/hybrid.py
	third_party/sqlalchemy/ext/instrumentation.py
	third_party/sqlalchemy/ext/mutable.py
	third_party/sqlalchemy/ext/orderinglist.py
	third_party/sqlalchemy/ext/serializer.py
	third_party/sqlalchemy/inspection.py
	third_party/sqlalchemy/interfaces.py
	third_party/sqlalchemy/log.py
	third_party/sqlalchemy/orm/__init__.py
	third_party/sqlalchemy/orm/attributes.py
	third_party/sqlalchemy/orm/base.py
	third_party/sqlalchemy/orm/collections.py
	third_party/sqlalchemy/orm/dependency.py
	third_party/sqlalchemy/orm/deprecated_interfaces.py
	third_party/sqlalchemy/orm/descriptor_props.py
	third_party/sqlalchemy/orm/dynamic.py
	third_party/sqlalchemy/orm/evaluator.py
	third_party/sqlalchemy/orm/events.py
	third_party/sqlalchemy/orm/exc.py
	third_party/sqlalchemy/orm/identity.py
	third_party/sqlalchemy/orm/instrumentation.py
	third_party/sqlalchemy/orm/interfaces.py
	third_party/sqlalchemy/orm/loading.py
	third_party/sqlalchemy/orm/mapper.py
	third_party/sqlalchemy/orm/path_registry.py
	third_party/sqlalchemy/orm/persistence.py
	third_party/sqlalchemy/orm/properties.py
	third_party/sqlalchemy/orm/query.py
	third_party/sqlalchemy/orm/relationships.py
	third_party/sqlalchemy/orm/scoping.py
	third_party/sqlalchemy/orm/session.py
	third_party/sqlalchemy/orm/state.py
	third_party/sqlalchemy/orm/strategies.py
	third_party/sqlalchemy/orm/strategy_options.py
	third_party/sqlalchemy/orm/sync.py
	third_party/sqlalchemy/orm/unitofwork.py
	third_party/sqlalchemy/orm/util.py
	third_party/sqlalchemy/pool.py
	third_party/sqlalchemy/processors.py
	third_party/sqlalchemy/schema.py
	third_party/sqlalchemy/sql/__init__.py
	third_party/sqlalchemy/sql/annotation.py
	third_party/sqlalchemy/sql/base.py
	third_party/sqlalchemy/sql/compiler.py
	third_party/sqlalchemy/sql/ddl.py
	third_party/sqlalchemy/sql/default_comparator.py
	third_party/sqlalchemy/sql/dml.py
	third_party/sqlalchemy/sql/elements.py
	third_party/sqlalchemy/sql/expression.py
	third_party/sqlalchemy/sql/functions.py
	third_party/sqlalchemy/sql/naming.py
	third_party/sqlalchemy/sql/operators.py
	third_party/sqlalchemy/sql/schema.py
	third_party/sqlalchemy/sql/selectable.py
	third_party/sqlalchemy/sql/sqltypes.py
	third_party/sqlalchemy/sql/type_api.py
	third_party/sqlalchemy/sql/util.py
	third_party/sqlalchemy/sql/visitors.py
	third_party/sqlalchemy/testing/__init__.py
	third_party/sqlalchemy/testing/assertions.py
	third_party/sqlalchemy/testing/assertsql.py
	third_party/sqlalchemy/testing/config.py
	third_party/sqlalchemy/testing/engines.py
	third_party/sqlalchemy/testing/entities.py
	third_party/sqlalchemy/testing/exclusions.py
	third_party/sqlalchemy/testing/fixtures.py
	third_party/sqlalchemy/testing/mock.py
	third_party/sqlalchemy/testing/pickleable.py
	third_party/sqlalchemy/testing/plugin/noseplugin.py
	third_party/sqlalchemy/testing/plugin/plugin_base.py
	third_party/sqlalchemy/testing/plugin/pytestplugin.py
	third_party/sqlalchemy/testing/profiling.py
	third_party/sqlalchemy/testing/requirements.py
	third_party/sqlalchemy/testing/runner.py
	third_party/sqlalchemy/testing/schema.py
	third_party/sqlalchemy/testing/suite/test_ddl.py
	third_party/sqlalchemy/testing/suite/test_insert.py
	third_party/sqlalchemy/testing/suite/test_reflection.py
	third_party/sqlalchemy/testing/suite/test_results.py
	third_party/sqlalchemy/testing/suite/test_select.py
	third_party/sqlalchemy/testing/suite/test_sequence.py
	third_party/sqlalchemy/testing/suite/test_types.py
	third_party/sqlalchemy/testing/suite/test_update_delete.py
	third_party/sqlalchemy/testing/util.py
	third_party/sqlalchemy/testing/warnings.py
	third_party/sqlalchemy/types.py
	third_party/sqlalchemy/util/__init__.py
	third_party/sqlalchemy/util/_collections.py
	third_party/sqlalchemy/util/compat.py
	third_party/sqlalchemy/util/deprecations.py
	third_party/sqlalchemy/util/langhelpers.py
	third_party/sqlalchemy/util/queue.py
	third_party/sqlalchemy/util/topological.py
Merge branch 'custom_forms' of https://github.com/gltn/stdm-plugin into custom_forms

Conflicts:
	third_party/__init__.py
	third_party/sqlalchemy/__init__.py
	third_party/sqlalchemy/connectors/__init__.py
	third_party/sqlalchemy/connectors/mxodbc.py
	third_party/sqlalchemy/connectors/mysqldb.py
	third_party/sqlalchemy/connectors/pyodbc.py
	third_party/sqlalchemy/connectors/zxJDBC.py
	third_party/sqlalchemy/databases/__init__.py
	third_party/sqlalchemy/dialects/__init__.py
	third_party/sqlalchemy/dialects/drizzle/base.py
	third_party/sqlalchemy/dialects/firebird/__init__.py
	third_party/sqlalchemy/dialects/firebird/base.py
	third_party/sqlalchemy/dialects/firebird/fdb.py
	third_party/sqlalchemy/dialects/firebird/kinterbasdb.py
	third_party/sqlalchemy/dialects/mssql/__init__.py
	third_party/sqlalchemy/dialects/mssql/adodbapi.py
	third_party/sqlalchemy/dialects/mssql/base.py
	third_party/sqlalchemy/dialects/mssql/information_schema.py
	third_party/sqlalchemy/dialects/mssql/mxodbc.py
	third_party/sqlalchemy/dialects/mssql/pymssql.py
	third_party/sqlalchemy/dialects/mssql/pyodbc.py
	third_party/sqlalchemy/dialects/mssql/zxjdbc.py
	third_party/sqlalchemy/dialects/mysql/__init__.py
	third_party/sqlalchemy/dialects/mysql/base.py
	third_party/sqlalchemy/dialects/mysql/cymysql.py
	third_party/sqlalchemy/dialects/mysql/gaerdbms.py
	third_party/sqlalchemy/dialects/mysql/mysqlconnector.py
	third_party/sqlalchemy/dialects/mysql/mysqldb.py
	third_party/sqlalchemy/dialects/mysql/oursql.py
	third_party/sqlalchemy/dialects/mysql/pymysql.py
	third_party/sqlalchemy/dialects/mysql/pyodbc.py
	third_party/sqlalchemy/dialects/mysql/zxjdbc.py
	third_party/sqlalchemy/dialects/oracle/__init__.py
	third_party/sqlalchemy/dialects/oracle/base.py
	third_party/sqlalchemy/dialects/oracle/cx_oracle.py
	third_party/sqlalchemy/dialects/oracle/zxjdbc.py
	third_party/sqlalchemy/dialects/postgres.py
	third_party/sqlalchemy/dialects/postgresql/__init__.py
	third_party/sqlalchemy/dialects/postgresql/base.py
	third_party/sqlalchemy/dialects/postgresql/constraints.py
	third_party/sqlalchemy/dialects/postgresql/hstore.py
	third_party/sqlalchemy/dialects/postgresql/json.py
	third_party/sqlalchemy/dialects/postgresql/pg8000.py
	third_party/sqlalchemy/dialects/postgresql/psycopg2.py
	third_party/sqlalchemy/dialects/postgresql/pypostgresql.py
	third_party/sqlalchemy/dialects/postgresql/ranges.py
	third_party/sqlalchemy/dialects/postgresql/zxjdbc.py
	third_party/sqlalchemy/dialects/sqlite/__init__.py
	third_party/sqlalchemy/dialects/sqlite/base.py
	third_party/sqlalchemy/dialects/sqlite/pysqlite.py
	third_party/sqlalchemy/dialects/sybase/__init__.py
	third_party/sqlalchemy/dialects/sybase/base.py
	third_party/sqlalchemy/dialects/sybase/mxodbc.py
	third_party/sqlalchemy/dialects/sybase/pyodbc.py
	third_party/sqlalchemy/dialects/sybase/pysybase.py
	third_party/sqlalchemy/engine/__init__.py
	third_party/sqlalchemy/engine/base.py
	third_party/sqlalchemy/engine/default.py
	third_party/sqlalchemy/engine/interfaces.py
	third_party/sqlalchemy/engine/reflection.py
	third_party/sqlalchemy/engine/result.py
	third_party/sqlalchemy/engine/strategies.py
	third_party/sqlalchemy/engine/threadlocal.py
	third_party/sqlalchemy/engine/url.py
	third_party/sqlalchemy/engine/util.py
	third_party/sqlalchemy/event/__init__.py
	third_party/sqlalchemy/event/api.py
	third_party/sqlalchemy/event/attr.py
	third_party/sqlalchemy/event/base.py
	third_party/sqlalchemy/event/legacy.py
	third_party/sqlalchemy/event/registry.py
	third_party/sqlalchemy/events.py
	third_party/sqlalchemy/exc.py
	third_party/sqlalchemy/ext/__init__.py
	third_party/sqlalchemy/ext/associationproxy.py
	third_party/sqlalchemy/ext/automap.py
	third_party/sqlalchemy/ext/compiler.py
	third_party/sqlalchemy/ext/declarative/__init__.py
	third_party/sqlalchemy/ext/declarative/api.py
	third_party/sqlalchemy/ext/declarative/base.py
	third_party/sqlalchemy/ext/declarative/clsregistry.py
	third_party/sqlalchemy/ext/horizontal_shard.py
	third_party/sqlalchemy/ext/hybrid.py
	third_party/sqlalchemy/ext/instrumentation.py
	third_party/sqlalchemy/ext/mutable.py
	third_party/sqlalchemy/ext/orderinglist.py
	third_party/sqlalchemy/ext/serializer.py
	third_party/sqlalchemy/inspection.py
	third_party/sqlalchemy/interfaces.py
	third_party/sqlalchemy/log.py
	third_party/sqlalchemy/orm/__init__.py
	third_party/sqlalchemy/orm/attributes.py
	third_party/sqlalchemy/orm/base.py
	third_party/sqlalchemy/orm/collections.py
	third_party/sqlalchemy/orm/dependency.py
	third_party/sqlalchemy/orm/deprecated_interfaces.py
	third_party/sqlalchemy/orm/descriptor_props.py
	third_party/sqlalchemy/orm/dynamic.py
	third_party/sqlalchemy/orm/evaluator.py
	third_party/sqlalchemy/orm/events.py
	third_party/sqlalchemy/orm/exc.py
	third_party/sqlalchemy/orm/identity.py
	third_party/sqlalchemy/orm/instrumentation.py
	third_party/sqlalchemy/orm/interfaces.py
	third_party/sqlalchemy/orm/loading.py
	third_party/sqlalchemy/orm/mapper.py
	third_party/sqlalchemy/orm/path_registry.py
	third_party/sqlalchemy/orm/persistence.py
	third_party/sqlalchemy/orm/properties.py
	third_party/sqlalchemy/orm/query.py
	third_party/sqlalchemy/orm/relationships.py
	third_party/sqlalchemy/orm/scoping.py
	third_party/sqlalchemy/orm/session.py
	third_party/sqlalchemy/orm/state.py
	third_party/sqlalchemy/orm/strategies.py
	third_party/sqlalchemy/orm/strategy_options.py
	third_party/sqlalchemy/orm/sync.py
	third_party/sqlalchemy/orm/unitofwork.py
	third_party/sqlalchemy/orm/util.py
	third_party/sqlalchemy/pool.py
	third_party/sqlalchemy/processors.py
	third_party/sqlalchemy/schema.py
	third_party/sqlalchemy/sql/__init__.py
	third_party/sqlalchemy/sql/annotation.py
	third_party/sqlalchemy/sql/base.py
	third_party/sqlalchemy/sql/compiler.py
	third_party/sqlalchemy/sql/ddl.py
	third_party/sqlalchemy/sql/default_comparator.py
	third_party/sqlalchemy/sql/dml.py
	third_party/sqlalchemy/sql/elements.py
	third_party/sqlalchemy/sql/expression.py
	third_party/sqlalchemy/sql/functions.py
	third_party/sqlalchemy/sql/naming.py
	third_party/sqlalchemy/sql/operators.py
	third_party/sqlalchemy/sql/schema.py
	third_party/sqlalchemy/sql/selectable.py
	third_party/sqlalchemy/sql/sqltypes.py
	third_party/sqlalchemy/sql/type_api.py
	third_party/sqlalchemy/sql/util.py
	third_party/sqlalchemy/sql/visitors.py
	third_party/sqlalchemy/testing/__init__.py
	third_party/sqlalchemy/testing/assertions.py
	third_party/sqlalchemy/testing/assertsql.py
	third_party/sqlalchemy/testing/config.py
	third_party/sqlalchemy/testing/engines.py
	third_party/sqlalchemy/testing/entities.py
	third_party/sqlalchemy/testing/exclusions.py
	third_party/sqlalchemy/testing/fixtures.py
	third_party/sqlalchemy/testing/mock.py
	third_party/sqlalchemy/testing/pickleable.py
	third_party/sqlalchemy/testing/plugin/noseplugin.py
	third_party/sqlalchemy/testing/plugin/plugin_base.py
	third_party/sqlalchemy/testing/plugin/pytestplugin.py
	third_party/sqlalchemy/testing/profiling.py
	third_party/sqlalchemy/testing/requirements.py
	third_party/sqlalchemy/testing/runner.py
	third_party/sqlalchemy/testing/schema.py
	third_party/sqlalchemy/testing/suite/test_ddl.py
	third_party/sqlalchemy/testing/suite/test_insert.py
	third_party/sqlalchemy/testing/suite/test_reflection.py
	third_party/sqlalchemy/testing/suite/test_results.py
	third_party/sqlalchemy/testing/suite/test_select.py
	third_party/sqlalchemy/testing/suite/test_sequence.py
	third_party/sqlalchemy/testing/suite/test_types.py
	third_party/sqlalchemy/testing/suite/test_update_delete.py
	third_party/sqlalchemy/testing/util.py
	third_party/sqlalchemy/testing/warnings.py
	third_party/sqlalchemy/types.py
	third_party/sqlalchemy/util/__init__.py
	third_party/sqlalchemy/util/_collections.py
	third_party/sqlalchemy/util/compat.py
	third_party/sqlalchemy/util/deprecations.py
	third_party/sqlalchemy/util/langhelpers.py
	third_party/sqlalchemy/util/queue.py
	third_party/sqlalchemy/util/topological.py