new hardy rev, as always. Such boring commit logs!
Merge branch 'gene_table_magic_height-2014-08-06'

Conflicts:
	modules/ui-common