Merge remote-tracking branch 'origin/feature/collections-performance' into feature/collections-performance
Build links for association proxy objects by inspecting the join object,
rather than by grabbing the id off of the target object. Ultimately,
this will eliminate the nead for eager loading most of the time.

Also, adopt a more efficient scheme for url generation for both resource
and view resources. The flask url_for method performs a lot of work that
needn't be repeatedly performed and short-circuiting that can provide a
great performance benefit.
Build relationship links using the available foreign key property,
otherwise use the target object as before.
Merge branch 'develop' into feature/collections-performance
Fixed import crash as a result of non-existing categories
Only show link to Admin Dashboard if allowed to view /admin
Control import working, cancel msg avoiding, systems and proc import clean_up
Merge pull request #158 from reciprocity/feature/log_events

Improved descriptions of association objects in the event log
Deferred column loading.
removed kind/type, real values for products
Merge develop
Merge branch 'develop' into feature/collections-performance

Conflicts:
	src/ggrc/models/directive.py
preps for tree fixes, 2nd tier info bit more clear
Merge pull request #162 from reciprocity/feature/misc-pivotal

Only show link to Admin Dashboard if allowed to view /admin
Merge pull request #165 from reciprocity/feature/tier2-update

Feature/tier2 update
Eager loading for categorizations, renable publishing of categories and
assertions.
Merge branch 'develop' into feature/collections-performance
Some post merge fixes.
Turn off sql echo.
Fix typo