temp commit
Merge branch 'master' of https://github.com/south10/todolist.git

Conflicts:
	wunderlist/pom.xml
	wunderlist/webapp/WEB-INF/web.xml
merged solution
setting