Finished Create Action Plan function (to database)
Merge origin/master