Feature/swagger ui merged with head

merged into ganeshram's team's changes plus added links in ui to swagger-ui