Merge pull request #171 from Edzelopez/RG-205

#35 Fixed query for marks field
#31 Restricted editing of amount requested field for users without appropriate permissions