Added add data function
Added view save data function
Merge remote-tracking branch 'origin/Development' into Development