Fix merge conflicts with branch of master
Updated comments for class views in projects/views.py