Modified service controller and added contact controller
Updated nav bar
Merge origin/master