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

Conflicts:
	TooDoo/src/main/webapp/Home.jsp