change homepage layout
Merge branch 'master' into bootstraplayout

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
modify user modle template.