Merge branch 'master' into development
Add terms for Andrew's patscans
fix boolean typo
InOutCall Preference
Change InOutCallPref model - Location's pref belongs to the body
uri based on category
Merge branch 'development'