Fixing pa_attribute create button (refs: #485)
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/models/pe_attribute.rb