add REST framework
Merge branch 'tao' into sprint10
Merge branch 'marcia' into sprint10