Commit Tests Controllers  refs #321
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	spec/controller_macros.rb
Merge remote-tracking branch 'origin/dev' into dev
Commit Tests Controllers  refs #321
Merge remote-tracking branch 'origin/dev' into dev