Merged conflicts, deleted tmp and log files

Merged with sufis pages
+ css styling for access and carousel