fixed comma issue
changes for asset loading on heroku
Merge branch 'master' into home_page_design
fixed service provider block issue