point before merged origin files
fixed conflicts
Added actions for crud and added moment js for formatting dates