Fixed merge conflict in the Errors file; Updated the Field Template and User models to accomodate for relationships between the three;
Added the Field module;