don't cache hours ajax JSON requests
Merge branch 'ajax-no-cache' into prod
update production js version number
Merge branch 'prod' into v2

Conflicts:
	js/build/production.min.js - using prod version