validation added
Merge branch 'ambesh' into gunanka

Conflicts:
	app/views/layouts/application.html.erb