addition of application branch
final commit before association for application
final commit -association
application model
merging files
just errors left