Merge branch 'User-&-Admin'

Conflicts:
	app/Plugin/Users/View/Users/dashboard.ctp
	app/View/Elements/actions.ctp
	app/View/Elements/myMenu.ctp
	app/View/Layouts/default_login_after_ver02.ctp