Profile view and jQuery colorbox added
Resolved merger conflict