Moves contents of PlanningElementType into Type.

This leaves PlanningElementType an almost empty subclass of Type, soon
to be removed entirely.
Adds fields from PlanningElementType into Type.
Use strong parameters for type
Merge branch 'feature/rails3' into feature/merge_planning_element_type_with_type
Add planning element type attributes to type form
Add planning element type attributes to type index

[skip ci]
Fix type sort
Rename type step definition file
Rename type administration cuke file
Fix type's given step
Strong params for update and flash for deletion
Use controller instead of helper variable
Make deletion button visible for cukes
Fixes icon method reference
Fixes icon method reference
Removes PE type controller and views
Use type in API
Do not include module name
Merge remote-tracking branch 'opf/feature/rails3' into feature/merge_planning_element_type_with_type
Changes pagination defaults.

This changes the per_page_options to '100,500,1000'.