Update ordering to use new position field in order_by statements
Added ability to pass a variable to nav tag

Signed-off-by: bpotterschipul <bpotter@schipul.com>
Add new template tag nav_object
Merge pull request #313 from bpotterschipul/master

Adding ability to pass a variable to nav template tag
Delete south migration conflicts for memberships - To be rebuilt.
Updating membership migration 0015 to include added/missing fields.
Merge branch 'refs/heads/master' into membership_multi_apps
Rebuild some membership migrations due to merge conflicts
Adjust the order of url patterns for corpmembership_add.