Merge pull request #37 from Edzelopez/GEP-19

GEP-25 Worked on save as draft functionality
GEP-25 Worked on bug fixes