Simplify the "Estimateion plan" map and "Associate module" pages: refs #466
Merge branch 'dev' of github.com:projestimate/projestimate into dev