Removing unecessary extra controller
Merging all angularjs into one file
Merging all angularjs into one file
Merge client back together