add logoutAction,modify task display
Merge branch 'master' of https://github.com/godluck/tower

Conflicts:
	WebRoot/js/scripts.js
 modify task display