Remembering chosen role as active
Making sure role is selected
Merge branch 'master' of github.com:idega/com.idega.block.navigation into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/block/navigation/business/UserPageHomeResolverImpl.java
Merge branch 'BRANCH_PLATFORM_5' of github.com:idega/com.idega.block.navigation into BRANCH_PLATFORM_5