Merge branch 'frontend-init'
Merge branch 'master' into gn-phase-2
New database with fields
Merge branch 'gn-phase-2'
Resolved conflict on index

Conflicts:
	wp-content/themes/dream/index.php