Merge branch 'dev' of https://github.com/projestimate/projestimate into dev

Conflicts:
	app/models/ability.rb
	app/views/permissions/_form.html.erb
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev
refs #272