Tags improvement
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/COB-INF/security/flow/login.flow