adding db stuff
angular stuff
debugging angularBridge in server.coffee
added angular bridge without break
merge fixed