added js files and updated controllers. added a test view
fixed conflicts