model and collection for Staff page added
Merge remote-tracking branch 'origin/master'
view for Staff page started
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/Generated_files.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/app/application.js
	public/js/app/hr_manager/collections/staff_collection.coffee
	public/js/app/hr_manager/collections/staff_collection.js
	public/js/app/hr_manager/collections/staff_collection.map
	public/js/app/hr_manager/models/staff_model.coffee
	public/js/app/hr_manager/models/staff_model.js
	public/js/app/hr_manager/models/staff_model.map
Trying to fix bug with grid display / loading
Trying to fix bug with grid display / loading - one bug fixed.
Grid is displaying, fixing the grid template
fixing the grid template
trying to fix the grid template