Combine alias_view and define_view as view
Merge remote branch 'e/develop' into develop
Merge branch 'develop' into define_view
Merge pull request #110 from GerryG/define_view

Define view
Merge branch 'develop' into account
Fixes for cardlib load order causing type_id_changed? issue
Merge remote branch 'wagn/develop' into develop
Merge develop to account
Merge branch 'account' into account2