minor design changes and updated service plan delete logic
Merge branch 'master' of https://github.com/hertus/sfitixi