Integration with rails

merging new server side code into master, this code contains the new model definition for report, which accepts additional fields that were required