adds finishes touches for alamid framework
resolves conflict
on sunday
does some file management
does some file management
merges from pgbuiler