cleaned assests
changes the js files to coffee. removes the erb extentions
merge