Going back to master for some tickets
Merge branch 'development' into new_batch
Ready for UI review though I need to see about the data formattting on save
Merge branch 'new_batch' into development