Merge branch 'master' of git@github.com:sinuni/Fellesprosjektet.git

Conflicts:
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/BlobFromLocator$LocatorInputStream.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/BlobFromLocator.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement$CallableStatementParam.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement$CallableStatementParamInfo.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement$CallableStatementParamInfoJDBC3.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CompressedInputStream.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/Connection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionImpl$CompoundCacheKey.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionImpl$ExceptionInterceptorChain.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionImpl.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionPropertiesImpl$ConnectionProperty.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$IteratorWithCleanup.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$LocalAndReferencedColumns.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$ResultSetIterator.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$SingleStringIterator.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$TypeDescriptor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaDataUsingInfoSchema.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/FailoverConnectionProxy$FailoverInvocationHandler.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/FailoverConnectionProxy.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/IterateBlock.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4CallableStatement.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4ClientInfoProviderSP.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4CommentClientInfoProvider.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4MySQLConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4UpdatableResultSet.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/LoadBalancedMySQLConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/LoadBalancingConnectionProxy$ConnectionErrorFiringInvocationHandler.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/LoadBalancingConnectionProxy.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/MiniAdmin.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/MySQLConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/MysqlIO.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$AppendingBatchVisitor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$BatchParams.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$BatchVisitor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$EmulatedPreparedStatementBindings.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$EndPoint.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$ParseInfo.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ProfilerEventHandlerFactory.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ReplicationConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ResultSetImpl.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/RowDataDynamic$OperationNotSupportedException.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/RowDataDynamic.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/StatementImpl$CancelTask.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/StatementImpl.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/UpdatableResultSet.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/exceptions/jdbc4/CommunicationsException.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/integration/c3p0/MysqlConnectionTester.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/interceptors/ServerStatusDiffInterceptor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4ConnectionWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4PreparedStatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4StatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSourceFactory.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/log/LogFactory.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/log/LogUtils.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/profiler/LoggingProfilerEventHandler.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/util/ReadAheadInputStream.class
	mysql-connector-java-5.1.18/src/testsuite/BaseTestCase.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory$HangingInputStream.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory$HangingOutputStream.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory$HangingSocket.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory.class
	mysql-connector-java-5.1.18/src/testsuite/perf/BasePerfTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/CallableStatementRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest$CountingReBalanceStrategy.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest$ForcedLoadBalanceStrategy.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest$PortNumberSocketFactory.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/DataSourceRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/MetaDataRegressionTest$StatementInterceptorBug61332.class
	mysql-connector-java-5.1.18/src/testsuite/regression/MetaDataRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/PooledConnectionRegressionTest$ConnectionListener.class
	mysql-connector-java-5.1.18/src/testsuite/regression/PooledConnectionRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ResultSetRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$Bug39426Interceptor.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$IncrementStatementCountInterceptor.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$IsClosedInputStream.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$IsClosedReader.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$PrepareThread.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$ScanDetectingInterceptor.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StringRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/CallableStatementTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ConnectionTest$LocalSocketAddressCheckThread.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ConnectionTest$SpawnedWorkerCounter.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ConnectionTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/DataSourceTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/MiniAdminTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ResultSetTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/SSLTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/SimpleTransformer.class
	mysql-connector-java-5.1.18/src/testsuite/simple/XATest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/jdbc4/StatementsTest.class
Merge branch 'master' of github.com:sinuni/Fellesprosjektet

Conflicts:
	model/Meeting.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/BlobFromLocator$LocatorInputStream.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/BlobFromLocator.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement$CallableStatementParam.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement$CallableStatementParamInfo.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement$CallableStatementParamInfoJDBC3.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CallableStatement.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/CompressedInputStream.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionImpl$CompoundCacheKey.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionImpl$ExceptionInterceptorChain.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionImpl.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ConnectionPropertiesImpl$ConnectionProperty.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$IteratorWithCleanup.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$LocalAndReferencedColumns.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$ResultSetIterator.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$SingleStringIterator.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData$TypeDescriptor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaData.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/DatabaseMetaDataUsingInfoSchema.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/FailoverConnectionProxy$FailoverInvocationHandler.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/FailoverConnectionProxy.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/IterateBlock.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4CallableStatement.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4ClientInfoProviderSP.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4CommentClientInfoProvider.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/JDBC4UpdatableResultSet.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/LoadBalancedMySQLConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/LoadBalancingConnectionProxy$ConnectionErrorFiringInvocationHandler.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/LoadBalancingConnectionProxy.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/MiniAdmin.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/MysqlIO.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$AppendingBatchVisitor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$BatchParams.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$BatchVisitor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$EmulatedPreparedStatementBindings.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$EndPoint.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement$ParseInfo.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/PreparedStatement.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ProfilerEventHandlerFactory.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ReplicationConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/ResultSetImpl.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/RowDataDynamic$OperationNotSupportedException.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/RowDataDynamic.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/StatementImpl$CancelTask.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/StatementImpl.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/UpdatableResultSet.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/exceptions/jdbc4/CommunicationsException.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/integration/c3p0/MysqlConnectionTester.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/interceptors/ServerStatusDiffInterceptor.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4CallableStatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4ConnectionWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4PreparedStatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/JDBC4StatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSourceFactory.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/log/LogFactory.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/log/LogUtils.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/profiler/LoggingProfilerEventHandler.class
	mysql-connector-java-5.1.18/src/com/mysql/jdbc/util/ReadAheadInputStream.class
	mysql-connector-java-5.1.18/src/testsuite/BaseTestCase.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory$HangingInputStream.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory$HangingOutputStream.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory$HangingSocket.class
	mysql-connector-java-5.1.18/src/testsuite/UnreliableSocketFactory.class
	mysql-connector-java-5.1.18/src/testsuite/perf/BasePerfTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/CallableStatementRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest$CountingReBalanceStrategy.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest$ForcedLoadBalanceStrategy.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest$PortNumberSocketFactory.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ConnectionRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/DataSourceRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/MetaDataRegressionTest$StatementInterceptorBug61332.class
	mysql-connector-java-5.1.18/src/testsuite/regression/MetaDataRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/PooledConnectionRegressionTest$ConnectionListener.class
	mysql-connector-java-5.1.18/src/testsuite/regression/PooledConnectionRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/ResultSetRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$Bug39426Interceptor.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$IncrementStatementCountInterceptor.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$IsClosedInputStream.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$IsClosedReader.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$PrepareThread.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest$ScanDetectingInterceptor.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StatementRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/regression/StringRegressionTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/CallableStatementTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ConnectionTest$LocalSocketAddressCheckThread.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ConnectionTest$SpawnedWorkerCounter.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ConnectionTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/DataSourceTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/MiniAdminTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/ResultSetTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/SSLTest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/SimpleTransformer.class
	mysql-connector-java-5.1.18/src/testsuite/simple/XATest.class
	mysql-connector-java-5.1.18/src/testsuite/simple/jdbc4/StatementsTest.class