Updated templates
Removed user edit button color
Merge branch 'master' into btnColor2
merged master
Added new ApiControllerExtension
Updated UsersController to use new ApiControllerExtension methods