Fixed association parameters to not collide with cancan
Merge branch 'master' into orders
Git rid of splash
Merge branch 'orders' into delivery_views