Added promote to frontpage to featured CT and view
Fixed margin bug on frontpage block
Fixed merge conflict