house keeping - removing the trash
ignoring tomcat folder
Merge branch 'master' of github.com:ptrecenti/time-tracking

Conflicts:
	src/main/java/br/com/timetracking/TimeTrackingSearchService.java
	src/main/java/br/com/timetracking/TimeTrackingService.java
	src/main/java/br/com/timetracking/UserSearchService.java
	src/main/java/br/com/timetracking/UserService.java
	src/main/java/br/com/timetracking/desktop/task/TaskPresentationModel.java
	src/main/java/br/com/timetracking/domain/task/DayEntriesSpecification.java
	src/main/java/br/com/timetracking/server/TimeTrackingServiceServer.java
	src/main/java/br/com/timetracking/server/TimeTrackingServlet.java