add hours to hour column
Merge branch 'master' into days
nist
Merge branch 'master' into days

Conflicts:
	client/testnaApp.html
added hours