Added table for users listing
Added task object definition and table
Removed unused tags
Updated projects table
Updated Roo's log
Fixed merge error
Merge remote-tracking branch 'origin/master'

Conflicts:
	log.roo
	src/main/webapp/WEB-INF/tags/dashboard/users_table.tagx
	src/main/webapp/WEB-INF/views/admin/index.jspx