refs #473 not finished
refs #280
and some code improvement
Merge branch 'dev' of github.com:projestimate/projestimate into dev

Conflicts:
	app/assets/stylesheets/dashboard.css