Merge conflict
Front page done. closes #2473