EditorBean
Merge branch 'master' of https://github.com/dimce011/campus201305.git
EditorBean2
eb2
Merge remote-tracking branch 'origin/master'

Conflicts:
	mpayments-help/mpayments-help-repo-rest/src/main/java/org/infobip/mpayments/help/repo/rest/RestAPIService.java
	mpayments-help/mpayments-help-repo-rest/src/main/java/org/infobip/mpayments/help/repo/rest/RestHelpRepo.java
	mpayments-help/mpayments-help-repo-rest/src/main/java/org/infobip/mpayments/help/repo/rest/RestHelpRepoService.java
	mpayments-help/mpayments-help-web/src/main/java/com/bluelotussoftware/example/jsf/TreeBeanCvor.java
	mpayments-help/mpayments-help-web/src/main/webapp/treeBeanCvor.xhtml
Ispravljen conflict