Added editplan as well as 'create plan for this location'
Merge branch 'orhan' into development