add logout button
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/default/templates/indexSuccess.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/default/templates/indexSuccess.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/dashboard/templates/indexSuccess.php
Merge branch 'master' of github.com:maximin/kproject
Merge branch 'master' of github.com:maximin/kproject
add logout button