options
Merge branch 'master' of http://github.com/mdjasper/htapp

Conflicts:
	ht-app.txt
Merge branch 'master' of http://github.com/mdjasper/htapp