finished Aspect Fill for cells
fixing conflicts
Merge branch 'master' of https://github.com/pkprosol/DowntownAlliance