refs #363
refs #290
Merge branch 'dev' of github.com:projestimate/projestimate into dev

Conflicts:
	app/views/users/_users.html.erb
Merge branch 'dev' of github.com:projestimate/projestimate into dev
Smalle bugs on syntax
Merge branch 'dev' of github.com:projestimate/projestimate into dev
Smalle bugs on syntax