syncing rails: migrations, models, controllers, angular: srvics, ctrl, ...
routes fix
schema
merge fixes
now app is restricted
menu
Merge branch 'feature/merge_upstream' into develop