Fix up merge
Fix pom
Fix restful interface handling; links generation