Merge branch 'master' of github.com:benaich/Association

Conflicts:
	web/js/flot/jquery.flot.time.js