31/03/14

integration continued

testing to be done later

database restructuring first