Merge branch 'release/3.0'
ignored idea folder
ignored idea folder
added scaffold and migration for journals
added description field
fixed missing description field/column from journal views
added many to many for employees and journals
added employees in journal form
Merge branch 'master' of github.com:aharita/numeros into feature/trip_expenses
Merge branch 'feature/trip_expenses' into develop