none
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/TOI/dao/DaoFactory.java
	src/main/java/org/ikea/gettraderServlet.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/TOI/dao/DaoFactory.java
	src/main/java/org/ikea/gettraderServlet.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/TOI/dao/DaoFactory.java
	src/main/java/org/ikea/gettraderServlet.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/TOI/dao/DaoFactory.java
	src/main/java/org/ikea/gettraderServlet.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/TOI/dao/DaoFactory.java
	src/main/java/org/ikea/gettraderServlet.java