refs #473, #469, #470, #471
Merge branch 'dev' of github.com:projestimate/projestimate into dev

Conflicts:
	vendor/gems/cocomo_basic-0.0.1/lib/cocomo_basic.rb