build master
Fix to i18n translation files (bad json format)
Change the way we build the WMP player object to be exactly like old site in terms of IE vs the rest
Missing in previous commit
Merge remote-tracking branch 'origin/client'
merge bug fixes before first deployment to real production
change api location after deployment to real production
Merge remote-tracking branch 'origin/client'

Conflicts:
	js/services.js
Production build (dist)
Mainly code style changes and some IE related stuff
add geo strim and hide quality if not online
fix lang bug
Extract api base url to separate config module. Add environment variables to grunt build script
Merge branch 'dev' of github.com:Bnei-Baruch/kabtv into dev

Conflicts:
	js/module.js
	js/services.js
Fix for dynamic streams service to use the url from the DB instead of building it in the client
Staging build