Update ht.js
Update pass_activities.html
Update ht.js
Update pass_activities.html
Update ht.js
Merge branch 'master' of https://github.com/laoflch/myinfosit.git

Conflicts:
	myinfosit/app/plugins/happytime/html/pass_activities.html
	myinfosit/app/plugins/happytime/js/ht.js