fix for issue 196
Fixing merge issue
Merge pull request #208 from jdalphon/jd_issue196

Removed duplicate code
Merge branch 'master' of git://github.com/isenseDev/rSENSE into HM_Page_JS
Renamed all page spesific js from .js.coffee.erb to .js.coffee