minor refactoring
Merge branch 'master' of https://github.com/batrakaran/gene

Conflicts:
	content/src/main/content/jcr_root/apps/gene/templates/onecolumn/.content.xml