EOD 2013 06-28
resolved controller.js conflict