r
regression test suite
sss
Alfresco pages refactored
x
Merge branch 'master' of https://github.com/ailies/FoP2.git

Conflicts:
	MarkLogic/src/main/java/AlfrescoPages/AlfrescoActionsPage.java