test
Merge branch 'master' of github.com:pleanoma/TooDoo

Conflicts:
	TooDoo/.classpath
	TooDoo/.gitignore
	TooDoo/.project
	TooDoo/.settings/org.eclipse.jdt.core.prefs
	TooDoo/.settings/org.eclipse.wst.common.component
	TooDoo/.settings/org.eclipse.wst.common.project.facet.core.xml
	TooDoo/pom.xml
	TooDoo/src/main/java/com/sck/Connector.java
	TooDoo/src/main/java/com/sck/TooDooServlet.java
	TooDoo/src/main/webapp/Home.jsp
	TooDoo/src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of github.com:pleanoma/TooDoo